fix: stampa contratti

Author: Pek5892

templates/contratti/body.php

@@ -39,7 +39,7 @@
 
 // Creazione righe fantasma ottimizzata
 $autofill = new Util\Autofill($columns);
-$rows_per_page = 23;
+$rows_per_page = 22;
 $rows_first_page = 36;
 $autofill->setRows($rows_per_page, 0, $rows_first_page);
 
@@ -220,7 +220,7 @@
 
             if ($riga->sconto > 0) {
                 $text = discountInfo($riga, false);
-
+                $autofill->count($text, true);
                 echo '
                 <br><small class="text-muted">'.$text.'</small>';
             }
@@ -247,6 +247,7 @@
         if ($options['pricing']) {
             echo '
             <td></td>
+            <td></td>
             <td></td>';
         }
     }
@@ -257,6 +258,7 @@
     $autofill->next();
 }
 
+    $autofill->count($documento['esclusioni']);
 echo '
         |autofill|
     </tbody>';
@@ -277,7 +279,7 @@
     // Totale imponibile
     echo '
     <tr>
-        <td colspan="'.($options['show-only-total'] ? (($has_image) ? 3 : 2) : 5).'" class="text-right text-muted">
+        <td colspan="'.($options['show-only-total'] ? (($has_image) ? 3 : 2) : 4).'" class="text-right text-muted">
             <b>'.tr('Imponibile', [], ['upper' => true]).':</b>
         </td>
 
@@ -290,7 +292,7 @@
     if ($show_sconto) {
         echo '
     <tr>
-        <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right text-muted">
+        <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right text-muted">
             <b>'.tr($sconto > 0 ? 'Sconto' : 'Maggiorazione', [], ['upper' => true]).':</b>
         </td>
 
@@ -302,22 +304,20 @@
         // Totale imponibile
         echo '
     <tr>
-        <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right text-muted">
+        <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right text-muted">
             <b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
         </td>
 
         <th colspan="'.($options['show-only-total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
             <b>'.moneyFormat($totale_imponibile, $d_totali).'</b>
         </th>
     </tr>';
-        $autofill->set(3);
-        $autofill->next();
     }
     if (!$options['no-iva']) {
         // IVA
         echo '
         <tr>
-            <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right text-muted">
+            <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right text-muted">
                 <b>'.tr('Totale IVA', [], ['upper' => true]).':</b>
             </td>
 
@@ -329,7 +329,7 @@
         // TOTALE
         echo '
         <tr>
-            <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right text-muted">
+            <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right text-muted">
                 <b>'.tr('Totale documento', [], ['upper' => true]).':</b>
             </td>
 
@@ -342,7 +342,7 @@
             // SCONTO IN FATTURA
             echo '
             <tr>
-                 <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right">
+                 <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right">
                     <b>'.tr('Sconto in fattura', [], ['upper' => true]).':</b>
                 </td>
                <th colspan="'.($options['show-only-total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
@@ -353,14 +353,13 @@
             // NETTO A PAGARE
             echo '
             <tr>
-                <td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right">
+                <td colspan="'.($options['show-only-total'] ? 2 : 4).'" class="text-right">
                     <b>'.tr('Netto a pagare', [], ['upper' => true]).':</b>
                 </td>
                 <th colspan="'.($options['show-only-total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
                     <b>'.moneyFormat($netto_a_pagare, $d_totali).'</b>
                 </th>
             </tr>';
-            $autofill->set(2);
         }
     }
 }