T-13933/fix: Derive net amount from gross and tax amount

two-inc · Nov 8, 2023 · adb89d4 · adb89d4
1 parent 1947ac8
commit adb89d4
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/Service/Order.php b/Service/Order.php
@@ -239,7 +239,7 @@ public function roundAmt($amt, $dp = 2): string
      */
     public function getGrossAmountItem($item): float
     {
-        return (float)$this->getNetAmountItem($item) + (float)$this->getTaxAmountItem($item);
+        return $this->getNetAmountAfterDiscountItem($item) + $this->getTaxAmountItem($item);
     }
 
     /**
@@ -248,7 +248,25 @@ public function getGrossAmountItem($item): float
      */
     public function getNetAmountItem($item): float
     {
-        return (float)$item->getRowTotal() - $this->getDiscountAmountItem($item);
+        return round($this->getGrossAmountItem($item), 2) - round($this->getTaxAmountItem($item), 2);
+    }
+
+    /**
+     * @param OrderItem|InvoiceItem|CreditmemoItem $item
+     * @return float
+     */
+    public function getNetAmountBeforeDiscountItem($item): float
+    {
+        return (float)$item->getRowTotalInclTax() / (1 + $this->getTaxRateItem($item));
+    }
+
+    /**
+     * @param OrderItem|InvoiceItem|CreditmemoItem $item
+     * @return float
+     */
+    public function getNetAmountAfterDiscountItem($item): float
+    {
+        return $this->getNetAmountBeforeDiscountItem($item) - $this->getDiscountAmountItem($item);
     }
 
     /**
@@ -257,7 +275,7 @@ public function getNetAmountItem($item): float
      */
     public function getUnitPriceItem($item): float
     {
-        return (float)$item->getRowTotalInclTax() / (1 + $this->getTaxRateItem($item)) / $item->getQtyOrdered();
+        return (float)$item->getPriceInclTax() / (1 + $this->getTaxRateItem($item));
     }
 
     /**
@@ -275,7 +293,7 @@ public function getTaxRateItem($item): float
      */
     public function getTaxAmountItem($item): float
     {
-        return $this->getNetAmountItem($item) * $this->getTaxRateItem($item);
+        return $this->getNetAmountAfterDiscountItem($item) * $this->getTaxRateItem($item);
     }
 
     /**
@@ -284,7 +302,12 @@ public function getTaxAmountItem($item): float
      */
     public function getDiscountAmountItem($item): float
     {
-        return abs((float)$item->getDiscountAmount()) - abs((float)$item->getDiscountTaxCompensationAmount());
+        $discount = abs((float)$item->getDiscountAmount());
+        $discountTaxCompensation = abs((float)$item->getDiscountTaxCompensationAmount());
+        if ($discountTaxCompensation > 0) {
+            $discountTaxCompensation = $discount * (1 - 1 / (1 + $this->getTaxRateItem($item)));
+        }
+        return $discount - $discountTaxCompensation;
     }
 
     /**