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

Correzione stampa consuntivo preventivi

This commit is contained in:
Beppe 2023-08-02 18:07:03 +02:00
parent d723b749e0
commit 89bce6d940
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/riepilogo_interventi/bottom.php Executable file → Normal file
View File

@ -38,8 +38,12 @@ echo '
<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">'.($somma_km).'</td>
</th>';
if( get('id_print')!=24 ){
echo '
<th class="text-center">'.($somma_km).'</td>';
}
echo '
<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>
@ -51,7 +55,7 @@ echo '
<th class="text-right" style="border-left: 0;">
<b>'.tr('Iva', [], ['upper' => true]).':</b>
</th>
<th colspan="4"></th>
<th colspan="'.( get('id_print')!=24 ? 4 : 3).'"></th>
<th class="text-center">'.($pricing ? moneyFormat($somma_iva, 2) : '-').'</th>
</tr>
@ -60,7 +64,7 @@ echo '
<th class="text-right" style="border-left: 0;">
<b>'.tr('Totale Ivato', [], ['upper' => true]).':</b>
</th>
<th colspan="4"></th>
<th colspan="'.( get('id_print')!=24 ? 4 : 3).'"></th>
<th class="text-center">'.($pricing ? moneyFormat($somma_totale_ivato, 2) : '-').'</th>
</tr>
</tbody>

16
templates/riepilogo_interventi/piece.php Executable file → Normal file
View File

@ -77,8 +77,12 @@ echo '
$ore = Translator::numberToLocale($ore, 2);
}
echo '
</td>
<td class="text-center">'.($km).'</td>
</td>';
if( get('id_print')!=24 ){
echo '
<td class="text-center">'.($km).'</td>';
}
echo '
<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>
@ -90,7 +94,7 @@ if (count($sessioni) > 0) {
echo '
<tr>
<td style="border-top: 0; border-bottom: 0;"></td>
<th style="background-color: #eee" colspan="3"><small>'.tr('Sessioni').'</small></th>
<th style="background-color: #eee" colspan="'.( get('id_print')!=24 ? 3 : 2).'"><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>
@ -100,7 +104,7 @@ if (count($sessioni) > 0) {
echo '
<tr>
<td style="border-top: 0; border-bottom: 0;"></td>
<td colspan="3"><small>'.$sessione->anagrafica->ragione_sociale.' <small>('.$sessione->tipo->descrizione.')</small></td>
<td colspan="'.( get('id_print')!=24 ? 3 : 2).'"><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>
@ -114,7 +118,7 @@ if (!$righe->isEmpty()) {
echo '
<tr>
<td style="border-top: 0; border-bottom: 0;"></td>
<th style="background-color: #eee" colspan="3"><small>'.tr('Materiale utilizzato e spese aggiuntive').'</small></th>
<th style="background-color: #eee" colspan="'.( get('id_print')!=24 ? 3 : 2).'"><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>
@ -127,7 +131,7 @@ if (!$righe->isEmpty()) {
echo '
<tr>
<td style="border-top: 0; border-bottom: 0;"></td>
<td colspan="3"><small>'.$riga->descrizione.'</small></td>
<td colspan="'.( get('id_print')!=24 ? 3 : 2).'"><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>