From 3db93349d180a4fa1fb6ab8fd3395bba86462521 Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Fri, 6 Oct 2023 16:37:33 +0200 Subject: [PATCH 1/7] Aggiunta colonna riferimento in DDT in uscita --- update/2_4_50.sql | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/update/2_4_50.sql b/update/2_4_50.sql index 10b58d7e5..2f402bf68 100644 --- a/update/2_4_50.sql +++ b/update/2_4_50.sql @@ -97,3 +97,80 @@ INSERT INTO `zz_settings` (`nome`, `valore`, `tipo`, `editable`, `sezione`, `ord UPDATE `co_pianodeiconti2` SET `dir` = 'entrata/uscita' WHERE `co_pianodeiconti2`.`descrizione` = 'Immobilizzazioni'; INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `html_format`, `search_inside`, `order_by`, `visible`, `summable`, `default`) VALUES ((SELECT id FROM zz_modules WHERE name = 'Scadenzario'), 'Esportazione distinta', 'presentazioni_exported_at', '20', '1', '0', '1', '0', '', '', '1', '0', '0'); + +-- Fix query vista Ordini cliente +UPDATE `zz_modules` SET `options` = " +SELECT + |select| +FROM + `or_ordini` + LEFT JOIN `or_tipiordine` ON `or_ordini`.`idtipoordine` = `or_tipiordine`.`id` + LEFT JOIN `an_anagrafiche` ON `or_ordini`.`idanagrafica` = `an_anagrafiche`.`idanagrafica` + LEFT JOIN (SELECT `idordine`, SUM(`qta` - `qta_evasa`) AS `qta_da_evadere`, SUM(`subtotale` - `sconto`) AS `totale_imponibile`, SUM(`subtotale` - `sconto` + `iva`) AS `totale` FROM `or_righe_ordini` GROUP BY `idordine`) AS righe ON `or_ordini`.`id` = `righe`.`idordine` + LEFT JOIN (SELECT `idordine`, MIN(`data_evasione`) AS `data_evasione` FROM `or_righe_ordini` WHERE (`qta` - `qta_evasa`)>0 GROUP BY `idordine`) AS `righe_da_evadere` ON `righe`.`idordine`=`righe_da_evadere`.`idordine` + LEFT JOIN `or_statiordine` ON `or_statiordine`.`id` = `or_ordini`.`idstatoordine` + LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT 'Fattura ',`co_documenti`.`numero_esterno` SEPARATOR ', ') AS `info`, `co_righe_documenti`.`original_document_id` AS `idordine` FROM `co_documenti` INNER JOIN `co_righe_documenti` ON `co_documenti`.`id` = `co_righe_documenti`.`iddocumento` WHERE `original_document_type`='Modules\\\\Ordini\\\\Ordine' GROUP BY original_document_id) AS `fattura` ON `fattura`.`idordine` = `or_ordini`.`id` + LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT 'DDT ', `dt_ddt`.`id` SEPARATOR ', ') AS `info`, `dt_righe_ddt`.`original_document_id` AS `idddt` FROM `dt_ddt` INNER JOIN `dt_righe_ddt` ON `dt_ddt`.`id`=`dt_righe_ddt`.`idddt` WHERE `original_document_type`='Modules\\\\Ordini\\\\Ordine' GROUP BY original_document_id) AS `ddt` ON `ddt`.`idddt`=`or_ordini`.`id` + LEFT JOIN (SELECT COUNT(id) as emails, em_emails.id_record FROM em_emails INNER JOIN zz_operations ON zz_operations.id_email = em_emails.id WHERE id_module IN(SELECT id FROM zz_modules WHERE name = 'Ordini cliente') AND `zz_operations`.`op` = 'send-email' GROUP BY id_record) AS `email` ON `email`.`id_record` = `or_ordini`.`id` +WHERE + 1=1 |segment(`or_ordini`.`id_segment`)| AND `dir` = 'entrata' |date_period(`or_ordini`.`data`)| +HAVING + 2=2 +ORDER BY + `data` DESC, + CAST(`numero_esterno` AS UNSIGNED) DESC" WHERE `name` = 'Ordini cliente'; + +-- Fix query vista Ddt in entrata +UPDATE `zz_modules` SET `options` = " +SELECT + |select| +FROM + `dt_ddt` + LEFT JOIN `an_anagrafiche` ON `dt_ddt`.`idanagrafica` = `an_anagrafiche`.`idanagrafica` + LEFT JOIN `dt_tipiddt` ON `dt_ddt`.`idtipoddt` = `dt_tipiddt`.`id` + LEFT JOIN `dt_causalet` ON `dt_ddt`.`idcausalet` = `dt_causalet`.`id` + LEFT JOIN `dt_spedizione` ON `dt_ddt`.`idspedizione` = `dt_spedizione`.`id` + LEFT JOIN `an_anagrafiche` `vettori` ON `dt_ddt`.`idvettore` = `vettori`.`idanagrafica` + LEFT JOIN `an_sedi` AS sedi ON `dt_ddt`.`idsede_partenza` = sedi.`id` + LEFT JOIN `an_sedi` AS `sedi_destinazione`ON `dt_ddt`.`idsede_destinazione` = `sedi_destinazione`.`id` + LEFT JOIN(SELECT `idddt`, SUM(`subtotale` - `sconto`) AS `totale_imponibile`, SUM(`subtotale` - `sconto` + `iva`) AS `totale` FROM `dt_righe_ddt` GROUP BY `idddt`) AS righe ON `dt_ddt`.`id` = `righe`.`idddt` + LEFT JOIN `dt_statiddt` ON `dt_statiddt`.`id` = `dt_ddt`.`idstatoddt` + LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT 'Fattura ',`co_documenti`.`numero` SEPARATOR ', ') AS `info`, `co_righe_documenti`.`original_document_id` AS `idddt` FROM `co_documenti` INNER JOIN `co_righe_documenti` ON `co_documenti`.`id` = `co_righe_documenti`.`iddocumento` WHERE `original_document_type`='Modules\\\\DDT\\\\DDT' GROUP BY `original_document_id`) AS `fattura` ON `fattura`.`idddt` = `dt_ddt`.`id` +WHERE + 1=1 |segment(`dt_ddt`.`id_segment`)| AND `dir` = 'uscita' |date_period(`data`)| +HAVING + 2=2 +ORDER BY + `data` DESC, + CAST(`numero_esterno` AS UNSIGNED) DESC, + `dt_ddt`.created_at DESC" WHERE `name` = 'Ddt di acquisto'; + +-- Aggiungo colonna riferimento in Ddt in uscita +UPDATE `zz_modules` SET `options` = " +SELECT + |select| +FROM + `dt_ddt` + LEFT JOIN `an_anagrafiche` ON `dt_ddt`.`idanagrafica` = `an_anagrafiche`.`idanagrafica` + LEFT JOIN `dt_tipiddt` ON `dt_ddt`.`idtipoddt` = `dt_tipiddt`.`id` + LEFT JOIN `dt_causalet` ON `dt_ddt`.`idcausalet` = `dt_causalet`.`id` + LEFT JOIN `dt_spedizione` ON `dt_ddt`.`idspedizione` = `dt_spedizione`.`id` + LEFT JOIN `an_anagrafiche` `vettori` ON `dt_ddt`.`idvettore` = `vettori`.`idanagrafica` + LEFT JOIN `an_sedi` AS sedi ON `dt_ddt`.`idsede_partenza` = sedi.`id` + LEFT JOIN `an_sedi` AS `sedi_destinazione`ON `dt_ddt`.`idsede_destinazione` = `sedi_destinazione`.`id` + LEFT JOIN (SELECT `idddt`, SUM(`subtotale` - `sconto`) AS `totale_imponibile`, SUM(`subtotale` - `sconto` + `iva`) AS `totale` FROM `dt_righe_ddt` GROUP BY `idddt`) AS righe ON `dt_ddt`.`id` = `righe`.`idddt` + LEFT JOIN `dt_statiddt` ON `dt_statiddt`.`id` = `dt_ddt`.`idstatoddt` + LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT 'Fattura ',`co_documenti`.`numero_esterno` SEPARATOR ', ') AS `info`, `co_righe_documenti`.`original_document_id` AS `idddt` FROM `co_documenti` INNER JOIN `co_righe_documenti` ON `co_documenti`.`id` = `co_righe_documenti`.`iddocumento` WHERE `original_document_type`='Modules\\\\DDT\\\\DDT' GROUP BY `original_document_id`) AS `fattura` ON `fattura`.`idddt` = `dt_ddt`.`id` + LEFT JOIN (SELECT COUNT(id) as emails, em_emails.id_record FROM em_emails INNER JOIN zz_operations ON zz_operations.id_email = em_emails.id WHERE id_module IN(SELECT id FROM zz_modules WHERE name = 'Ddt di vendita') AND `zz_operations`.`op` = 'send-email' GROUP BY id_record) AS `email` ON `email`.`id_record` = `dt_ddt`.`id` +WHERE + 1=1 |segment(`dt_ddt`.`id_segment`)| AND `dir` = 'entrata' |date_period(`data`)| +HAVING + 2=2 +ORDER BY + `data` DESC, + CAST(`numero_esterno` AS UNSIGNED) DESC, + `dt_ddt`.created_at DESC" WHERE `name` = 'Ddt di vendita'; + +INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `default`, `visible`) VALUES +((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di vendita'), 'icon_Inviato', 'IF(emails IS NOT NULL, \'fa fa-envelope text-success\', \'\')', 15, 1, 0, 0 ,0), +((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di vendita'), 'Riferimenti', 'IF(fattura.info != "", fattura.info,"")', 16, 1, 0, 0 ,0); \ No newline at end of file From ab6c0f11c5b5b2bb8af921b9b3af23b95369880a Mon Sep 17 00:00:00 2001 From: Beppe Date: Fri, 6 Oct 2023 17:05:31 +0200 Subject: [PATCH 2/7] Fix per visualizzazione maggiorazione in stampa --- templates/preventivi/body.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php index d8f7ad815..0fe593f80 100755 --- a/templates/preventivi/body.php +++ b/templates/preventivi/body.php @@ -262,7 +262,7 @@ foreach ($righe as $key => $riga) { '.moneyFormat($prezzi_ivati ? $riga->prezzo_unitario_ivato : $riga->prezzo_unitario); - if ($riga->sconto > 0) { + if ($riga->sconto != 0) { $text = discountInfo($riga, false); echo ' From d733a1db4aabc02bf8046f8fe1308fe095461c98 Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Fri, 6 Oct 2023 17:06:44 +0200 Subject: [PATCH 3/7] Fix visualizzazione note in righe --- assets/src/css/style.css | 14 +++++++++++++- modules/fatture/row-list.php | 22 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 9def59835..e47f4de6c 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -1225,4 +1225,16 @@ kbd{ padding: 6px 8px; display: inline-block; margin: 1px; -} \ No newline at end of file +} + +.read-more-target { + display: none; +} + +.read-more-trigger { + cursor: pointer; +} + +.read-more-target:target { + display: block; +} diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php index 84a20a7ef..64d4200c3 100755 --- a/modules/fatture/row-list.php +++ b/modules/fatture/row-list.php @@ -58,7 +58,6 @@ echo ' $num = 0; foreach ($righe as $riga) { ++$num; - $extra = ''; $mancanti = 0; $delete = 'delete_riga'; @@ -176,8 +175,25 @@ foreach ($righe as $riga) { } if (!empty($riga->note)) { - echo ' -
'.nl2br($riga->note).''; + + if(strlen($riga->note) > 50) { + $prima_parte = substr($riga->note, 0, ((strpos($riga->note, ' ', 50) < 60) && (strpos($riga->note, ' ', 50) != 0) ? strpos($riga->note, ' ', 50): 50)); + $seconda_parte = substr($riga->note, ((strpos($riga->note, ' ', 50) < 60) && (strpos($riga->note, ' ', 50) != 0) ? strpos($riga->note, ' ', 50): 50)); + $stringa_modificata = ''.$prima_parte.' + ' . $seconda_parte . '...'; + } else { + $stringa_modificata = ''.$riga->note.''; + } + + echo' +
+ +
+ '.nl2br($stringa_modificata).' +
+
+ '; + } echo ' '; From 6e9c7d6330ee2530dc77aea9967c1f40ba8e5d2c Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Fri, 6 Oct 2023 17:24:26 +0200 Subject: [PATCH 4/7] Fix query --- update/2_4_50.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update/2_4_50.sql b/update/2_4_50.sql index 2f402bf68..a81745c54 100644 --- a/update/2_4_50.sql +++ b/update/2_4_50.sql @@ -172,5 +172,5 @@ ORDER BY `dt_ddt`.created_at DESC" WHERE `name` = 'Ddt di vendita'; INSERT INTO `zz_views` (`id_module`, `name`, `query`, `order`, `search`, `slow`, `default`, `visible`) VALUES -((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di vendita'), 'icon_Inviato', 'IF(emails IS NOT NULL, \'fa fa-envelope text-success\', \'\')', 15, 1, 0, 0 ,0), -((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di vendita'), 'Riferimenti', 'IF(fattura.info != "", fattura.info,"")', 16, 1, 0, 0 ,0); \ No newline at end of file +((SELECT `id` FROM `zz_modules` WHERE `name` = 'Ddt di vendita'), 'Riferimenti', 'IF(fattura.info != "", fattura.info,"")', 16, 1, 0, 0 ,0); +UPDATE `zz_views` INNER JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `zz_views`.`query` = 'IF(emails IS NOT NULL, \'fa fa-envelope text-success\', \'\')' WHERE `zz_modules`.`name` = 'Ddt di vendita' AND `zz_views`.`name` = 'icon_Inviato'; From f6aa14fba8d2aef12ee4e00e9bdb4f5e6395e084 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 6 Oct 2023 19:32:01 +0200 Subject: [PATCH 5/7] Update gulpfile.js --- gulpfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gulpfile.js b/gulpfile.js index 1e424c53f..9d0a29a62 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -465,6 +465,7 @@ function release(done) { '!checksum.json', '!database.json', '!database_5_7.json', + '!manifest.json', '!.idea/**', '!.git/**', '!.github/**', From bcf1273903bf7aedb0e5569c9aaaba5a9be71dfb Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Mon, 9 Oct 2023 12:46:36 +0200 Subject: [PATCH 6/7] Aggiunta gestione filtro =data su tabelle --- src/Util/Query.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Util/Query.php b/src/Util/Query.php index c20a74131..fef77079b 100755 --- a/src/Util/Query.php +++ b/src/Util/Query.php @@ -225,8 +225,19 @@ class Query $search_filters[] = $search_query.' '.$sign.' '.prepare($value); } } elseif ($equal) { - $value = trim(str_replace(['='], '', $value)); - $search_filters[] = ($search_query.' = '.prepare($value).' OR '.$search_query.' LIKE '.prepare('% '.$value).' OR '.$search_query.' LIKE '.prepare($value.' %').' OR '.$search_query.' LIKE '.prepare('% '.$value.' %')); + $value = trim(str_replace(['='], '', $value)); + list($giorno, $mese, $anno) = explode('/', $value); + $data = "'".$anno.'-'.$mese.'-'.$giorno."'"; + + if ($anno != '' && $giorno != '' && $mese != '') { + if ($data != "'1970-01-01'") { + $search_filters[] = $search_query.' = '.$data.''; + } + + } else { + $search_filters[] = ($search_query.' = '.prepare($value).' OR '.$search_query.' LIKE '.prepare('% '.$value).' OR '.$search_query.' LIKE '.prepare($value.' %').' OR '.$search_query.' LIKE '.prepare('% '.$value.' %')); + } + } elseif ($notequal) { $value = trim(str_replace(['!='], '', $value)); $search_filters[] = ($search_query.' != '.prepare($value).' AND '.$search_query.' NOT LIKE '.prepare('% '.$value).' AND '.$search_query.' NOT LIKE '.prepare($value.' %').' AND '.$search_query.' NOT LIKE '.prepare('% '.$value.' %')); From cb22d644bab45d0d6e797934325e0d26bc9ea855 Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 10 Oct 2023 09:27:31 +0200 Subject: [PATCH 7/7] Corretto codice destinatario per fe verso san marino --- plugins/exportFE/src/FatturaElettronica.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/exportFE/src/FatturaElettronica.php b/plugins/exportFE/src/FatturaElettronica.php index fdd4bd8d6..682d11bca 100755 --- a/plugins/exportFE/src/FatturaElettronica.php +++ b/plugins/exportFE/src/FatturaElettronica.php @@ -627,7 +627,7 @@ class FatturaElettronica // Se il mio cliente non ha sede in Italia, il codice destinatario di default diventa (XXXXXXX) (sette X) $default_code = ($cliente->nazione->iso2 != 'IT') ? 'XXXXXXX' : $default_code; // Se il cliente ha sede a San Marino non ha nessun codice destinatario imposto quello dell'Ufficio tributario di San Marino - $default_code = (($cliente->nazione->iso2 == 'SM') && ($default_code == 'XXXXXXX')) ? '2R4GT08' : $default_code; + $default_code = (($cliente->nazione->iso2 == 'SM') && ($default_code == 'XXXXXXX')) ? '2R4GTO8' : $default_code; // Generazione dell'header // Se all'Anagrafe Tributaria il trasmittente รจ censito con il codice fiscale, es. ditte individuali