From f4c09094254588d47a3bd715ccce7b9d907ed02c Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Thu, 24 Sep 2020 09:53:53 +0200 Subject: [PATCH] Fix minori --- editor.php | 4 ++-- modules/interventi/edit.php | 2 +- update/2_4_16.sql | 2 +- update/2_4_18.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/editor.php b/editor.php index 7e8ec2938..df4523096 100755 --- a/editor.php +++ b/editor.php @@ -262,7 +262,7 @@ if (empty($record) || !$has_access) { }); '; - if ($structure->permission != '-' && $structure->use_notes) { + if ($structure->permission != '-' && $structure->use_notes && $user->gruppo != 'Clienti') { echo '
'; @@ -418,7 +418,7 @@ if ($read_only || !empty($block_edit)) { $(".checkbox-buttons label", "section.content")'.$not.'.addClass("disabled"); '; - //Nascondo il plugin note interne ai clienti + // Nascondo il plugin Note interne ai clienti if ($user->gruppo == 'Clienti') { echo ' $("#link-tab_note").hide();'; diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index dadddd250..7ef840659 100755 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -286,7 +286,7 @@ echo ' {[ "type": "ckeditor", "label": "", "name": "descrizione", "class": "autosize", "value": "$descrizione$", "extra": "rows='10'", "readonly": "" ]}
gruppo != 'Clienti') { echo '
diff --git a/update/2_4_16.sql b/update/2_4_16.sql index 7f37d720d..39d9bd694 100644 --- a/update/2_4_16.sql +++ b/update/2_4_16.sql @@ -133,7 +133,7 @@ ALTER TABLE `co_righe_documenti` ADD INDEX(`iddocumento`); INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `format`, `default`, `visible`) VALUES ((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ordini fornitore'), 'Data', 'or_ordini.data', 3, 1, 0, 0, 1); --- Plugin storico attività scheda Aanagrafiche +-- Plugin storico attività scheda Anagrafiche INSERT INTO `zz_plugins` (`id`, `name`, `title`, `idmodule_from`, `idmodule_to`, `position`, `script`, `enabled`, `default`, `order`, `compatibility`, `version`, `options2`, `options`, `directory`, `help`) VALUES (NULL, 'Storico attività', 'Storico attività', (SELECT id FROM zz_modules WHERE name = 'Interventi'), (SELECT id FROM zz_modules WHERE name='Anagrafiche'), 'tab', '', '1', '1', '0', '2.*', '0.1', NULL, '{ "main_query": [ { "type": "table", "fields": "Numero, Data inizio, Data fine, Tipo", "query": "SELECT in_interventi.id, in_interventi.codice AS Numero, DATE_FORMAT(MAX(orario_inizio),''%d/%m/%Y'') AS ''Data inizio'', DATE_FORMAT(MAX(orario_fine),''%d/%m/%Y'') AS ''Data fine'', (SELECT descrizione FROM in_tipiintervento WHERE idtipointervento=in_interventi.idtipointervento) AS ''Tipo'', (SELECT `id` FROM `zz_modules` WHERE `name` = ''Interventi'') AS _link_module_, in_interventi.id AS _link_record_ FROM in_interventi LEFT JOIN `in_interventi_tecnici` ON `in_interventi_tecnici`.`idintervento` = `in_interventi`.`id` LEFT JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`idstatointervento` WHERE 1=1 AND in_interventi.deleted_at IS NULL AND idanagrafica = |id_parent| HAVING 2=2 ORDER BY in_interventi.id DESC"} ]}', '', ''); -- Fix prezzo_unitario_ivato e sconto_iva_unitario per i documenti diff --git a/update/2_4_18.sql b/update/2_4_18.sql index 6c2e5d707..11619effb 100644 --- a/update/2_4_18.sql +++ b/update/2_4_18.sql @@ -176,4 +176,4 @@ UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `mg_articoli` LEFT JOI UPDATE `zz_plugins` SET `options` = ' { "main_query": [ { "type": "table", "fields": "Matricola, Nome, Data, Descrizione", "query": "SELECT id, (SELECT `id` FROM `zz_modules` WHERE `name` = ''Impianti'') AS _link_module_, id AS _link_record_, matricola AS Matricola, nome AS Nome, DATE_FORMAT(data, ''%d/%m/%Y'') AS Data, descrizione AS Descrizione FROM my_impianti WHERE idanagrafica=|id_parent| HAVING 2=2 ORDER BY id DESC"} ]}' WHERE `zz_plugins`.`name` = 'Impianti del cliente'; -- Fix per plugin Storico attività -UPDATE `zz_plugins` SET `options` = '{ "main_query": [ { "type": "table", "fields": "Numero, Data inizio, Data fine, Tipo", "query": "SELECT in_interventi.id, in_interventi.codice AS Numero, DATE_FORMAT(MAX(orario_inizio),''%d/%m/%Y'') AS ''Data inizio'', DATE_FORMAT(MAX(orario_fine),''%d/%m/%Y'') AS ''Data fine'', (SELECT descrizione FROM in_tipiintervento WHERE idtipointervento=in_interventi.idtipointervento) AS ''Tipo'', (SELECT `id` FROM `zz_modules` WHERE `name` = ''Interventi'') AS _link_module_, in_interventi.id AS _link_record_ FROM in_interventi LEFT JOIN `in_interventi_tecnici` ON `in_interventi_tecnici`.`idintervento` = `in_interventi`.`id` LEFT JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`idstatointervento` WHERE 1=1 AND in_interventi.deleted_at IS NULL AND idanagrafica = |id_parent| GROUP BY `in_interventi`.`id` HAVING 2=2 ORDER BY in_interventi.id DESC"} ]}' WHERE `name` = 'Storico attività'; +UPDATE `zz_plugins` SET `options` = '{"main_query": [{"type": "table", "fields": "Numero, Data inizio, Data fine, Tipo", "query": "SELECT in_interventi.id, in_interventi.codice AS Numero, DATE_FORMAT(MAX(orario_inizio),''%d/%m/%Y'') AS ''Data inizio'', DATE_FORMAT(MAX(orario_fine),''%d/%m/%Y'') AS ''Data fine'', (SELECT descrizione FROM in_tipiintervento WHERE idtipointervento=in_interventi.idtipointervento) AS ''Tipo'', (SELECT `id` FROM `zz_modules` WHERE `name` = ''Interventi'') AS _link_module_, in_interventi.id AS _link_record_ FROM in_interventi LEFT JOIN `in_interventi_tecnici` ON `in_interventi_tecnici`.`idintervento` = `in_interventi`.`id` LEFT JOIN `in_statiintervento` ON `in_interventi`.`idstatointervento`=`in_statiintervento`.`idstatointervento` WHERE 1=1 AND in_interventi.deleted_at IS NULL AND idanagrafica = |id_parent| GROUP BY `in_interventi`.`id` HAVING 2=2 ORDER BY in_interventi.id DESC"}]}'