Fix stampa preventivo
This commit is contained in:
parent
fae3f5da2f
commit
3fa824261d
|
@ -58,12 +58,12 @@ $has_image = $righe->search(function ($item) {
|
||||||
}) !== false;
|
}) !== false;
|
||||||
|
|
||||||
$columns = 6;
|
$columns = 6;
|
||||||
|
$columns = $options['pricing'] ? $columns : 3;
|
||||||
|
|
||||||
if ($has_image) {
|
if ($has_image) {
|
||||||
++$columns;
|
++$columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
$columns = $options['pricing'] ? $columns : 3;
|
|
||||||
|
|
||||||
// Creazione righe fantasma
|
// Creazione righe fantasma
|
||||||
$autofill = new \Util\Autofill($columns);
|
$autofill = new \Util\Autofill($columns);
|
||||||
$autofill->setRows(20, 10);
|
$autofill->setRows(20, 10);
|
||||||
|
@ -303,7 +303,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<b>'.tr('Imponibile', [], ['upper' => true]).':</b>
|
<b>'.tr('Imponibile', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).'</b>
|
<b>'.moneyFormat($show_sconto ? $imponibile : $totale_imponibile, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -316,7 +316,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
|
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($sconto, 2).'</b>
|
<b>'.moneyFormat($sconto, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -328,7 +328,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
|
<b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($totale_imponibile, 2).'</b>
|
<b>'.moneyFormat($totale_imponibile, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -341,7 +341,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<b>'.tr('Totale IVA', [], ['upper' => true]).':</b>
|
<b>'.tr('Totale IVA', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($totale_iva, 2).'</b>
|
<b>'.moneyFormat($totale_iva, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -352,7 +352,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
||||||
<b>'.tr('Totale documento', [], ['upper' => true]).':</b>
|
<b>'.tr('Totale documento', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($totale, 2).'</b>
|
<b>'.moneyFormat($totale, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -364,7 +364,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
||||||
<b>'.tr('Sconto in fattura', [], ['upper' => true]).':</b>
|
<b>'.tr('Sconto in fattura', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($sconto_finale, 2).'</b>
|
<b>'.moneyFormat($sconto_finale, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
@ -375,7 +375,7 @@ if (($options['pricing'] && !isset($options['hide_total'])) || $options['show_on
|
||||||
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
<td colspan="'.($options['show_only_total'] ? 2 : 4).'" class="text-right border-top">
|
||||||
<b>'.tr('Netto a pagare', [], ['upper' => true]).':</b>
|
<b>'.tr('Netto a pagare', [], ['upper' => true]).':</b>
|
||||||
</td>
|
</td>
|
||||||
<th colspan="'.($options['show_only_total'] ? (($has_images) ? 2 : 1) : (($has_images) ? 3 : 2)).'" class="text-right">
|
<th colspan="'.($options['show_only_total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">
|
||||||
<b>'.moneyFormat($netto_a_pagare, 2).'</b>
|
<b>'.moneyFormat($netto_a_pagare, 2).'</b>
|
||||||
</th>
|
</th>
|
||||||
</tr>';
|
</tr>';
|
||||||
|
|
Loading…
Reference in New Issue