loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix #608

This commit is contained in:
Thomas Zilio 2019-08-28 10:36:08 +02:00
parent 0c597e2697
commit f018728b5a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/fatture/body.php
View File

@ -9,7 +9,7 @@ $v_totale = [];
$autofill = new \Util\Autofill(5, 40); $autofill = new \Util\Autofill(5, 40);
$rows_per_page = $fattura_accompagnatoria ? 15 : 20; $rows_per_page = $fattura_accompagnatoria ? 15 : 20;
if (!empty($options['last-page-footer'])) { if (!empty($options['last-page-footer'])) {
$rows_per_page += 10; $rows_per_page += 7;
} }
$autofill->setRows($rows_per_page); $autofill->setRows($rows_per_page);

14
templates/fatture/footer.php
View File

@ -250,9 +250,9 @@ if (!empty($record['ritenutaacconto']) || !empty($documento->totale_ritenuta_con
echo ' echo '
<th class="text-center small" colspan="'.$second_colspan.'">'; <th class="text-center small" colspan="'.$second_colspan.'">';
if (empty($record['split_payment'])) { if (empty($record['split_payment'])) {
echo tr('Netto a pagare', [], ['upper' => true]); echo tr('Netto a pagare', [], ['upper' => true]);
} else { } else {
echo tr('Totale', [], ['upper' => true]); echo tr('Totale', [], ['upper' => true]);
} }
echo ' echo '
</th>'; </th>';
@ -262,13 +262,13 @@ if (!empty($record['ritenutaacconto']) || !empty($documento->totale_ritenuta_con
<tr> <tr>
<td class="cell-padded text-center" colspan="'.$first_colspan.'"> <td class="cell-padded text-center" colspan="'.$first_colspan.'">
'.moneyFormat(abs($documento->ritenuta_acconto) + $documento->totale_ritenuta_contributi, 2).' '.moneyFormat(abs($documento->ritenuta_acconto) + abs($documento->totale_ritenuta_contributi), 2).'
</td>'; </td>';
echo ' echo '
<td class="cell-padded text-center" colspan="'.$second_colspan.'"> <td class="cell-padded text-center" colspan="'.$second_colspan.'">
'.moneyFormat($totale - abs($documento->ritenuta_acconto) - $documento->totale_ritenuta_contributi, 2).' '.moneyFormat($netto_a_pagare, 2).'
</td> </td>
</tr>'; </tr>';
} }
@ -281,7 +281,7 @@ if (!empty($record['split_payment'])) {
echo ' echo '
<tr> <tr>
<th class="text-center small" colspan="'.$first_colspan.'"> <th class="text-center small" colspan="'.$first_colspan.'">
'.tr('iva a carico del destinatario', [], ['upper' => true]).' '.tr('IVA a carico del destinatario', [], ['upper' => true]).'
</th> </th>
<th class="text-center small" colspan="'.$second_colspan.'"> <th class="text-center small" colspan="'.$second_colspan.'">
@ -292,11 +292,11 @@ if (!empty($record['split_payment'])) {
echo ' echo '
<tr> <tr>
<td class="cell-padded text-center" colspan="'.$first_colspan.'"> <td class="cell-padded text-center" colspan="'.$first_colspan.'">
'.moneyFormat($totale_iva, 2).' '.moneyFormat($totale_iva, 2).'
</td> </td>
<td class="cell-padded text-center" colspan="'.$second_colspan.'"> <td class="cell-padded text-center" colspan="'.$second_colspan.'">
'.moneyFormat($totale - $totale_iva - abs($documento->ritenuta_acconto) - $documento->totale_ritenuta_contributi, 2).' '.moneyFormat($netto_a_pagare, 2).'
</td> </td>
</tr>'; </tr>';
} }