diff --git a/templates/ddt/body.php b/templates/ddt/body.php index ba6fc7bd3..9e29c1eb4 100755 --- a/templates/ddt/body.php +++ b/templates/ddt/body.php @@ -3,7 +3,7 @@ include_once __DIR__.'/../../core.php'; // Creazione righe fantasma -$autofill = new \Util\Autofill($options['pricing'] ? 5 : 2); +$autofill = new \Util\Autofill($options['pricing'] ? 6 : 3); $rows_per_page = 16; if (!empty($options['last-page-footer'])) { $rows_per_page += 10; @@ -15,6 +15,7 @@ echo " + '; @@ -39,7 +40,14 @@ foreach ($righe as $riga) { $autofill->count($r['descrizione']); echo ' - + '; + + echo' + '; + + + echo'
".tr('#', [], ['upper' => true])." ".tr('Descrizione', [], ['upper' => true])." ".tr('Q.tà', [], ['upper' => true]).'
+ '.($r['order']+1).' '.nl2br($r['descrizione']); diff --git a/templates/ddt/footer.php b/templates/ddt/footer.php index 5158bfb90..bef6f6a15 100755 --- a/templates/ddt/footer.php +++ b/templates/ddt/footer.php @@ -88,7 +88,7 @@ echo ' echo ' - diff --git a/templates/fatture/body.php b/templates/fatture/body.php index 335d01bf4..095fa3b36 100755 --- a/templates/fatture/body.php +++ b/templates/fatture/body.php @@ -6,7 +6,7 @@ $v_iva = []; $v_totale = []; // Creazione righe fantasma -$autofill = new \Util\Autofill(5, 40); +$autofill = new \Util\Autofill(6, 40); $rows_per_page = $fattura_accompagnatoria ? 15 : 20; if (!empty($options['last-page-footer'])) { $rows_per_page += 7; @@ -18,6 +18,7 @@ echo "
+ '.tr('Aspetto beni', [], ['upper' => true]).'
+ @@ -39,7 +40,15 @@ foreach ($righe as $riga) { $v_totale[$r['desc_iva']] = sum($v_totale[$r['desc_iva']], $riga->totale_imponibile); echo ' - + '; + + + echo' + '; + + + echo '
".tr('#', [], ['upper' => true])." ".tr('Descrizione', [], ['upper' => true])." ".tr('Q.tà', [], ['upper' => true])." ".tr('Prezzo unitario', [], ['upper' => true])."
+ '.($r['order']+1).' '.nl2br($r['descrizione']);