diff --git a/src/InvoiceLine.php b/src/InvoiceLine.php index 9e4119b..37af8f3 100644 --- a/src/InvoiceLine.php +++ b/src/InvoiceLine.php @@ -296,7 +296,7 @@ public function setBaseQuantity(float $baseQuantity): self { /** * Get total net amount (without VAT) before allowances/charges - * @return float|null Net amount before allowances/charges + * @return float|null Net amount before allowances/charges */ public function getNetAmountBeforeAllowancesCharges(): ?float { if ($this->price === null) { @@ -308,7 +308,7 @@ public function getNetAmountBeforeAllowancesCharges(): ?float { /** * Get allowances total amount - * @return float Allowances total amount + * @return float Allowances total amount */ public function getAllowancesAmount(): float { $allowancesAmount = 0; @@ -322,7 +322,7 @@ public function getAllowancesAmount(): float { /** * Get charges total amount - * @return float Charges total amount + * @return float Charges total amount */ public function getChargesAmount(): float { $chargesAmount = 0; @@ -337,7 +337,7 @@ public function getChargesAmount(): float { /** * Get total net amount (without VAT) * NOTE: inclusive of line level allowances and charges - * @return float|null Net amount + * @return float|null Net amount */ public function getNetAmount(): ?float { $netAmount = $this->getNetAmountBeforeAllowancesCharges(); diff --git a/src/Writers/UblWriter.php b/src/Writers/UblWriter.php index ea9b302..f7095c5 100644 --- a/src/Writers/UblWriter.php +++ b/src/Writers/UblWriter.php @@ -740,8 +740,8 @@ private function addAllowanceOrCharge( // Amount $baseAmount = $atDocumentLevel ? - $totals->netAmount : // @phan-suppress-current-line PhanPossiblyUndeclaredProperty - $line->getNetAmount() ?? 0.0; // @phan-suppress-current-line PhanPossiblyNonClassMethodCall + $totals->netAmount : // @phan-suppress-current-line PhanPossiblyUndeclaredProperty + $line->getNetAmountBeforeAllowancesCharges() ?? 0.0; // @phan-suppress-current-line PhanPossiblyNonClassMethodCall $this->addAmountNode( $xml, 'cbc:Amount', diff --git a/tests/Integration/peppol-allowance.xml b/tests/Integration/peppol-allowance.xml index afd415e..cbdefac 100644 --- a/tests/Integration/peppol-allowance.xml +++ b/tests/Integration/peppol-allowance.xml @@ -208,8 +208,8 @@ CG Cleaning 1 - 40.4 - 4040 + 41 + 4100 Description of item @@ -298,8 +298,8 @@ CG Charge 1 - 9.09 - 909 + 10 + 1000 Description of item