diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php index 3b1519129..dfa980839 100644 --- a/templates/preventivi/body.php +++ b/templates/preventivi/body.php @@ -174,15 +174,15 @@ $totale = $documento->totale; $show_sconto = $sconto > 0; // TOTALE COSTI FINALI -if ($options['pricing'] and !isset($options['hide_total'])) { +if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_only_total']) { // Totale imponibile echo ' - + '.tr('Imponibile', [], ['upper' => true]).': - + '.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).' '; @@ -191,11 +191,11 @@ if ($options['pricing'] and !isset($options['hide_total'])) { if ($show_sconto) { echo ' - + '.tr('Sconto', [], ['upper' => true]).': - + '.moneyFormat($sconto, 2).' '; @@ -203,11 +203,11 @@ if ($options['pricing'] and !isset($options['hide_total'])) { // Totale imponibile echo ' - + '.tr('Totale imponibile', [], ['upper' => true]).': - + '.moneyFormat($totale_imponibile, 2).' '; @@ -216,11 +216,11 @@ if ($options['pricing'] and !isset($options['hide_total'])) { // IVA echo ' - + '.tr('Totale IVA', [], ['upper' => true]).': - + '.moneyFormat($totale_iva, 2).' '; @@ -228,10 +228,10 @@ if ($options['pricing'] and !isset($options['hide_total'])) { // TOTALE echo ' - + '.tr('Totale documento', [], ['upper' => true]).': - + '.moneyFormat($totale, 2).' '; diff --git a/update/2_4_14.sql b/update/2_4_14.sql index ed6c7b54b..2a61d053f 100644 --- a/update/2_4_14.sql +++ b/update/2_4_14.sql @@ -30,4 +30,7 @@ ALTER TABLE `dt_righe_ddt` CHANGE `qta_evasa` `qta_evasa` decimal(14, 6) NOT NUL ALTER TABLE `co_righe_preventivi` CHANGE `qta_evasa` `qta_evasa` decimal(14, 6) NOT NULL; ALTER TABLE `co_righe_documenti` CHANGE `qta_evasa` `qta_evasa` decimal(14, 6) NOT NULL; ALTER TABLE `co_righe_contratti` CHANGE `qta_evasa` `qta_evasa` decimal(14, 6) NOT NULL; -ALTER TABLE `mg_articoli` CHANGE `threshold_qta` `threshold_qta` decimal(14, 6) NOT NULL; \ No newline at end of file +ALTER TABLE `mg_articoli` CHANGE `threshold_qta` `threshold_qta` decimal(14, 6) NOT NULL; + +INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`) VALUES +(NULL, (SELECT id FROM zz_modules WHERE `name`='Preventivi'), 1, 'Preventivo (solo totale)', 'Preventivo (solo totale)', 'Preventivo num. {numero} del {data}', 'preventivi', 'idpreventivo', '{\"pricing\":false, \"show_only_total\":true}', 'fa fa-print', '', '', 0, 0, 1, 1); \ No newline at end of file