From 7b39b190d835a96f12664923f72ca6562ed8b4ad Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Wed, 9 Sep 2020 15:48:46 +0200
Subject: [PATCH] Fix colspan stampa preventivo

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

diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php
index 79b515adf..1af65a42e 100755
--- a/templates/preventivi/body.php
+++ b/templates/preventivi/body.php
@@ -151,7 +151,7 @@ foreach ($righe as $key => $riga) {
         <tr>';
 
     echo '
-        <td class="text-center" style="vertical-align: middle">
+        <td class="text-center" style="vertical-align: middle" width="25">
             '.($key + 1).'
         </td>';
 
@@ -258,7 +258,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Imponibile', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).'</b>
         </th>
     </tr>';
@@ -271,7 +271,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
             <b>'.tr('Sconto', [], ['upper' => true]).':</b>
         </td>
 
-        <th colspan="'.($options['show_only_total'] ? 1 : 3).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($sconto, 2).'</b>
         </th>
     </tr>';
@@ -283,7 +283,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'] ? 1 : 3).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($totale_imponibile, 2).'</b>
         </th>
     </tr>';
@@ -296,7 +296,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'] ? 1 : 3).'" class="text-right">
+        <th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($totale_iva, 2).'</b>
         </th>
     </tr>';
@@ -307,7 +307,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'] ? 1 : 3).'" class="text-right">
+    	<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
     		<b>'.moneyFormat($totale, 2).'</b>
     	</th>
     </tr>';