ztechno_core 0.0.117 → 0.0.119
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -792,13 +792,13 @@ class InvoiceService {
|
|
|
792
792
|
// === SUBSIDY SECTION (shown before grand total when subsidies are present) ===
|
|
793
793
|
let subsidyTotal = 0;
|
|
794
794
|
if (subsidyItems.length > 0) {
|
|
795
|
-
P.
|
|
796
|
-
P.row('
|
|
795
|
+
P.bold().size(10);
|
|
796
|
+
P.row('Totaal incl. BTW:', 370, this.formatMoney(serviceTotalIncVat, invoice.currency), col5)
|
|
797
797
|
.skip(4)
|
|
798
798
|
.dashedRule(370, 560)
|
|
799
799
|
.skip(8);
|
|
800
800
|
P.bold().size(9);
|
|
801
|
-
P.text('Subsidie', 50, {}, 12);
|
|
801
|
+
P.text('Geschatte Subsidie', 50, {}, 12);
|
|
802
802
|
P.normal().size(9);
|
|
803
803
|
for (const item of subsidyItems) {
|
|
804
804
|
const subsidyAmount = Number(item.total_inc_vat ?? 0); // negative
|
|
@@ -810,9 +810,13 @@ class InvoiceService {
|
|
|
810
810
|
P.rule(370, 560).skip(8);
|
|
811
811
|
}
|
|
812
812
|
const grandTotal = serviceTotalIncVat + subsidyTotal; // subsidyTotal is negative
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
813
|
+
if (subsidyItems.length > 0) {
|
|
814
|
+
P.row('Totale Investering incl. Subsidie:', 370, this.formatMoney(grandTotal, invoice.currency), col5, 20);
|
|
815
|
+
} else {
|
|
816
|
+
P.bold();
|
|
817
|
+
P.row('Totaal incl. BTW:', 370, this.formatMoney(grandTotal, invoice.currency), col5, 20);
|
|
818
|
+
P.normal();
|
|
819
|
+
}
|
|
816
820
|
// === TWO-COLUMN FOOTER: Description & Terms (left) | Bank details (right) ===
|
|
817
821
|
const footerStartY = P.y + 10;
|
|
818
822
|
// LEFT COLUMN: Description + Payment terms
|
|
@@ -822,6 +826,7 @@ class InvoiceService {
|
|
|
822
826
|
P.text('Betalingsvoorwaarden:', 50, { width: 260 }, 12);
|
|
823
827
|
P.normal();
|
|
824
828
|
P.text(invoice.payment_terms, 50, { width: 260 }, 12);
|
|
829
|
+
P.skip(4);
|
|
825
830
|
}
|
|
826
831
|
if (invoice.description) {
|
|
827
832
|
P.size(10).bold();
|