From 323fa115c40efcb81f4de6b378fcb08f1d190a0f Mon Sep 17 00:00:00 2001
From: Pek5892 <pek5892@gmail.com>
Date: Mon, 13 Feb 2023 09:37:38 +0100
Subject: [PATCH] =?UTF-8?q?Aggiunta=20colonna=20KM=20in=20stampa=20riepilo?=
 =?UTF-8?q?go=20Attivit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/riepilogo_interventi/bottom.php |  5 +++--
 templates/riepilogo_interventi/piece.php  | 10 ++++++----
 templates/riepilogo_interventi/top.php    |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/templates/riepilogo_interventi/bottom.php b/templates/riepilogo_interventi/bottom.php
index 867d5f9c7..036a4bd25 100755
--- a/templates/riepilogo_interventi/bottom.php
+++ b/templates/riepilogo_interventi/bottom.php
@@ -38,6 +38,7 @@ echo '
             <th class="text-right" style="border-left: 0;">
                 <b>'.tr('Totale', [], ['upper' => true]).':</b>
             </th>
+            <th class="text-center">'.($km).'</td>
             <th class="text-center">'.($pricing ? $somma_ore : '-').'</th>
             <th class="text-center">'.($pricing ? moneyFormat($somma_imponibile, 2) : '-').'</th>
             <th class="text-center">'.($pricing ? moneyFormat($somma_sconto, 2) : '-').'</th>
@@ -49,7 +50,7 @@ echo '
             <th class="text-right" style="border-left: 0;">
                 <b>'.tr('Iva', [], ['upper' => true]).':</b>
             </th>
-            <th colspan="3"></th>
+            <th colspan="4"></th>
             <th class="text-center">'.($pricing ? moneyFormat($somma_iva, 2) : '-').'</th>
         </tr>
 
@@ -58,7 +59,7 @@ echo '
             <th class="text-right" style="border-left: 0;">
                 <b>'.tr('Totale Ivato', [], ['upper' => true]).':</b>
             </th>
-            <th colspan="3"></th>
+            <th colspan="4"></th>
             <th class="text-center">'.($pricing ? moneyFormat($somma_totale_ivato, 2) : '-').'</th>
         </tr>
     </tbody>
diff --git a/templates/riepilogo_interventi/piece.php b/templates/riepilogo_interventi/piece.php
index b71b715aa..bec4f4b3d 100755
--- a/templates/riepilogo_interventi/piece.php
+++ b/templates/riepilogo_interventi/piece.php
@@ -26,6 +26,7 @@ $intervento = Intervento::find($record['id']);
 $sessioni = $intervento->sessioni;
 $iva_predefinita = floatval(Aliquota::find(setting('Iva predefinita'))->percentuale);
 
+$km = $sessioni->sum('km');
 $ore = $sessioni->sum('ore');
 $imponibile = $tipo=='interno' ? $intervento->spesa : $intervento->imponibile;
 $sconto = $tipo=='interno' ? 0 : $intervento->sconto;
@@ -76,6 +77,7 @@ echo '
     }
 echo '
     </td>
+    <td class="text-center">'.($km).'</td>
     <td class="text-center">'.($pricing ? $ore : '-').'</td>
     <td class="text-center">'.($pricing ? moneyFormat($imponibile, 2) : '-').'</td>
     <td class="text-center">'.($pricing && empty($options['dir']) ? moneyFormat($sconto, 2) : '-').'</td>
@@ -87,7 +89,7 @@ if (count($sessioni) > 0) {
     echo '
 <tr>
     <td style="border-top: 0; border-bottom: 0;"></td>
-    <th style="background-color: #eee" colspan="2"><small>'.tr('Sessioni').'</small></th>
+    <th style="background-color: #eee" colspan="3"><small>'.tr('Sessioni').'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.tr('Data').'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.tr('Inizio').'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.tr('Fine').'</small></th>
@@ -97,7 +99,7 @@ if (count($sessioni) > 0) {
         echo '
 <tr>
     <td style="border-top: 0; border-bottom: 0;"></td>
-    <td colspan="2"><small>'.$sessione->anagrafica->ragione_sociale.' <small>('.$sessione->tipo->descrizione.')</small></td>
+    <td colspan="3"><small>'.$sessione->anagrafica->ragione_sociale.' <small>('.$sessione->tipo->descrizione.')</small></td>
     <td class="text-center"><small>'.dateFormat($sessione->orario_inizio).'</small></td>
     <td class="text-center"><small>'.timeFormat($sessione->orario_inizio).'</small></td>
     <td class="text-center"><small>'.timeFormat($sessione->orario_fine).'</small></td>
@@ -111,7 +113,7 @@ if (!$righe->isEmpty()) {
     echo '
 <tr>
     <td style="border-top: 0; border-bottom: 0;"></td>
-    <th style="background-color: #eee" colspan="2"><small>'.tr('Materiale utilizzato e spese aggiuntive').'</small></th>
+    <th style="background-color: #eee" colspan="3"><small>'.tr('Materiale utilizzato e spese aggiuntive').'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.tr('Qta').'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.($tipo=='interno' ? tr('Costo unitario') : tr('Prezzo unitario')).'</small></th>
     <th class="text-center" style="background-color: #eee"><small>'.($tipo=='interno' ? tr('Costo netto') : tr('Imponibile')).'</small></th>
@@ -124,7 +126,7 @@ if (!$righe->isEmpty()) {
         echo '
 <tr>
     <td style="border-top: 0; border-bottom: 0;"></td>
-    <td colspan="2"><small>'.$riga->descrizione.'</small></td>
+    <td colspan="3"><small>'.$riga->descrizione.'</small></td>
     <td class="text-center"><small>'.$riga->qta.' '.$riga->um.'</small></td>
     <td class="text-center"><small>'.($pricing ? moneyFormat($prezzo) : '-').'</small></td>
     <td class="text-center"><small>'.($pricing ? moneyFormat($totale) : '-').'</small></td>
diff --git a/templates/riepilogo_interventi/top.php b/templates/riepilogo_interventi/top.php
index f1862cea8..bb3b4ceaf 100755
--- a/templates/riepilogo_interventi/top.php
+++ b/templates/riepilogo_interventi/top.php
@@ -28,7 +28,8 @@ echo '
     <thead>
         <tr>
             <th colspan="2"><small>'.tr('Documento', [], ['upper' => true]).'</small></th>
-            <th class="text-center" style="width:10%"><small>'.tr('Ore', [], ['upper' => true]).'</small></th>
+            <th class="text-center" style="width:8%"><small>'.tr('KM', [], ['upper' => true]).'</small></th>
+            <th class="text-center" style="width:8%"><small>'.tr('Ore', [], ['upper' => true]).'</small></th>
             <th class="text-center" style="width:15%"><small>'.($tipo=='interno' ? tr('Costo totale', [], ['upper' => true]) : tr('Imponibile', [], ['upper' => true])).'</th>
             <th class="text-center" style="width:15%"><small>'.tr('Sconto', [], ['upper' => true]).'</small></th>
             <th class="text-center" style="width:15%"><small>'.($tipo=='interno' ? tr('Costo netto', [], ['upper' => true]) : tr('Totale imponibile', [], ['upper' => true])).'</small></th>