Merge pull request #41 from rycks/fix_40_allowance_lines

fix #40: allowance on lines
josemmo · Jun 24, 2023 · db6e3ce · db6e3ce
2 parents 9e2be42 + 2b297db
commit db6e3ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -208,8 +208,8 @@
             <cbc:AllowanceChargeReasonCode>CG</cbc:AllowanceChargeReasonCode>
             <cbc:AllowanceChargeReason>Cleaning</cbc:AllowanceChargeReason>
             <cbc:MultiplierFactorNumeric>1</cbc:MultiplierFactorNumeric>
-            <cbc:Amount currencyID="EUR">40.4</cbc:Amount>
-            <cbc:BaseAmount currencyID="EUR">4040</cbc:BaseAmount>
+            <cbc:Amount currencyID="EUR">41</cbc:Amount>
+            <cbc:BaseAmount currencyID="EUR">4100</cbc:BaseAmount>
         </cac:AllowanceCharge>
         <cac:Item>
             <cbc:Description>Description of item</cbc:Description>
@@ -298,8 +298,8 @@
             <cbc:AllowanceChargeReasonCode>CG</cbc:AllowanceChargeReasonCode>
             <cbc:AllowanceChargeReason>Charge</cbc:AllowanceChargeReason>
             <cbc:MultiplierFactorNumeric>1</cbc:MultiplierFactorNumeric>
-            <cbc:Amount currencyID="EUR">9.09</cbc:Amount>
-            <cbc:BaseAmount currencyID="EUR">909</cbc:BaseAmount>
+            <cbc:Amount currencyID="EUR">10</cbc:Amount>
+            <cbc:BaseAmount currencyID="EUR">1000</cbc:BaseAmount>
         </cac:AllowanceCharge>
         <cac:Item>
             <cbc:Description>Description of item</cbc:Description>