Agginto riferimento ID riga (order) anche in stampa fattura e ddt

This commit is contained in:
Luca 2020-05-29 16:32:00 +02:00
parent 9e40728bbe
commit 74961d88d9
3 changed files with 22 additions and 5 deletions

View File

@ -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 "
<table class='table table-striped table-bordered' id='contents'>
<thead>
<tr>
<th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th>
<th class='text-center'>".tr('Descrizione', [], ['upper' => true])."</th>
<th class='text-center' style='width:10%'>".tr('Q.tà', [], ['upper' => true]).'</th>';
@ -39,7 +40,14 @@ foreach ($righe as $riga) {
$autofill->count($r['descrizione']);
echo '
<tr>
<tr>';
echo'
<td class=\'text-center\' >
'.($r['order']+1).'</td>';
echo'
<td>
'.nl2br($r['descrizione']);

View File

@ -88,7 +88,7 @@ echo '
echo '
<table class="table-bordered">
<tr>
<th class="small" class style="width:25%">
<th class="small" class style="width:25%;">
'.tr('Aspetto beni', [], ['upper' => true]).'
</th>

View File

@ -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 "
<table class='table table-striped table-bordered' id='contents'>
<thead>
<tr>
<th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th>
<th class='text-center' style='width:50%'>".tr('Descrizione', [], ['upper' => true])."</th>
<th class='text-center' style='width:14%'>".tr('Q.tà', [], ['upper' => true])."</th>
<th class='text-center' style='width:16%'>".tr('Prezzo unitario', [], ['upper' => true])."</th>
@ -39,7 +40,15 @@ foreach ($righe as $riga) {
$v_totale[$r['desc_iva']] = sum($v_totale[$r['desc_iva']], $riga->totale_imponibile);
echo '
<tr>
<tr>';
echo'
<td class=\'text-center\' >
'.($r['order']+1).'</td>';
echo '
<td>
'.nl2br($r['descrizione']);