From 9e2ff37d39f5364a5ae7ea537dfbf92d35032450 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 3 Mar 2022 17:18:27 +0100 Subject: [PATCH] Fix parziale commit d5a129d (scheda Anagrafiche) --- composer.json | 2 +- plugins/dichiarazioni_intento/add.php | 3 +++ plugins/referenti/add.php | 3 +++ plugins/sedi/add.php | 3 +++ update/2_4_31.sql | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 907b70ae4..7c28d2fa3 100755 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ifsnop/mysqldump-php": "^2.3", "illuminate/database": "^6.0", "intervention/image": "^2.3", - "league/csv": "^8.2", + "league/csv": "9.5.0", "league/oauth2-client": "^2.6", "league/oauth2-google": "^3.0", "maximebf/debugbar": "^1.15", diff --git a/plugins/dichiarazioni_intento/add.php b/plugins/dichiarazioni_intento/add.php index df8e08c35..741718d42 100755 --- a/plugins/dichiarazioni_intento/add.php +++ b/plugins/dichiarazioni_intento/add.php @@ -25,6 +25,9 @@ echo ' + + +
diff --git a/plugins/referenti/add.php b/plugins/referenti/add.php index 6bc3d5ecb..4748ed91d 100755 --- a/plugins/referenti/add.php +++ b/plugins/referenti/add.php @@ -25,6 +25,9 @@ echo ' + + +
{[ "type": "text", "label": "'.tr('Nominativo').'", "name": "nome", "required": 1 ]} diff --git a/plugins/sedi/add.php b/plugins/sedi/add.php index 8c372dbe8..55192eda0 100755 --- a/plugins/sedi/add.php +++ b/plugins/sedi/add.php @@ -25,6 +25,9 @@ echo ' + + +
{[ "type": "select", "label": "'.tr('Anagrafica').'", "name": "id_anagrafica", "required": "1", "value": "'.$id_parent.'", "ajax-source": "anagrafiche", "disabled": 1 ]} diff --git a/update/2_4_31.sql b/update/2_4_31.sql index e9e7e77d5..c5b860f6a 100644 --- a/update/2_4_31.sql +++ b/update/2_4_31.sql @@ -70,7 +70,7 @@ INSERT INTO `zz_segments` (`id`, `id_module`, `name`, `clause`, `position`, `pat (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), 'Solo attivi', 'attivo=1', 'WHR', '####', '', 0, 0, 0, 0); -- Correzione widget articoli in magazzino -UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(\" \", REPLACE(REPLACE(REPLACE(FORMAT(SUM(qta),2), \",\", \"#\"), \".\", \",\"), \"#\", \".\"), \"unità\") AS dato FROM mg_articoli WHERE qta>0 AND deleted_at IS NULL AND servizio=0 AND 1=1' WHERE `zz_widgets`.`name` = 'Articoli in magazzino', `help` = 'Articoli a magazzino (tutti o solo attivi secondo il segmento)'; +UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(\" \", REPLACE(REPLACE(REPLACE(FORMAT(SUM(qta),2), \",\", \"#\"), \".\", \",\"), \"#\", \".\"), \"unità\") AS dato FROM mg_articoli WHERE qta>0 AND deleted_at IS NULL AND servizio=0 AND 1=1', `help` = 'Articoli a magazzino (tutti o solo attivi secondo il segmento)' WHERE `zz_widgets`.`name` = 'Articoli in magazzino'; -- Aggiunta colonna "Servizio" per vista Articoli INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `visible`, `format`, `default`) VALUES