#1091 - fix minori

This commit is contained in:
Pek5892 2022-10-11 13:14:20 +02:00
parent 012018b257
commit 672b443545
2 changed files with 14 additions and 2 deletions

View File

@ -26,13 +26,19 @@ $somma_totale_imponibile = sum($somma_totale_imponibile);
$somma_iva = sum($somma_iva);
$somma_totale_ivato = sum($somma_totale_ivato);
if (setting('Formato ore in stampa') == 'Sessantesimi') {
$somma_ore = Translator::numberToHours($somma_ore);
} else {
$somma_ore = Translator::numberToLocale($somma_ore, 2);
}
echo '
<tr>
<th width="5%" style="border-right: 0"></th>
<th class="text-right" style="border-left: 0;">
<b>'.tr('Totale', [], ['upper' => true]).':</b>
</th>
<th class="text-center">'.($pricing ? numberFormat($somma_ore, 2) : '-').'</th>
<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>
<th class="text-center">'.($pricing ? moneyFormat($somma_totale_imponibile, 2) : '-').'</th>

View File

@ -68,9 +68,15 @@ echo '
echo'
<p><b>'.tr('Descrizione').':</b> '.$intervento->descrizione.'</small></p>';
}
if (setting('Formato ore in stampa') == 'Sessantesimi') {
$ore = Translator::numberToHours($ore);
} else {
$ore = Translator::numberToLocale($ore, 2);
}
echo '
</td>
<td class="text-center">'.Translator::numberToLocale($ore).'</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>
<td class="text-center">'.($pricing ? moneyFormat($totale_imponibile, 2) : '-').'</td>