From 3fa824261d1a65180da86f61fd13bb3a1528bb22 Mon Sep 17 00:00:00 2001
From: MatteoPistorello <pistorellomatteo8@gmail.com>
Date: Mon, 16 May 2022 15:17:44 +0200
Subject: [PATCH] Fix stampa preventivo

---
 templates/preventivi/body.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php
index 7d33af91a..a243394d0 100755
--- a/templates/preventivi/body.php
+++ b/templates/preventivi/body.php
@@ -58,12 +58,12 @@ $has_image = $righe->search(function ($item) {
 }) !== false;
 
 $columns = 6;
+$columns = $options['pricing'] ? $columns : 3;
+
 if ($has_image) {
     ++$columns;
 }
 
-$columns = $options['pricing'] ? $columns : 3;
-
 // Creazione righe fantasma
 $autofill = new \Util\Autofill($columns);
 $autofill->setRows(20, 10);
@@ -303,7 +303,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Imponibile', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).'</b>
         </th>
     </tr>';
@@ -316,7 +316,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Sconto', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($sconto, 2).'</b>
         </th>
     </tr>';
@@ -328,7 +328,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($totale_imponibile, 2).'</b>
         </th>
     </tr>';
@@ -341,7 +341,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Totale IVA', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($totale_iva, 2).'</b>
         </th>
     </tr>';
@@ -352,7 +352,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
     	<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
             <b>'.tr('Totale documento', [], ['upper' => true]).':</b>
     	</td>
-    	<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+    	<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
     		<b>'.moneyFormat($totale, 2).'</b>
     	</th>
     </tr>';
@@ -364,7 +364,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
                 <b>'.tr('Sconto in fattura', [], ['upper' => true]).':</b>
             </td>
-            <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+            <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
                 <b>'.moneyFormat($sconto_finale, 2).'</b>
             </th>
         </tr>';
@@ -375,7 +375,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
                 <b>'.tr('Netto a pagare', [], ['upper' => true]).':</b>
             </td>
-            <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
+            <th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
                 <b>'.moneyFormat($netto_a_pagare, 2).'</b>
             </th>
         </tr>';