feat: quiqqer/invoice#104

ajax/products/calc.php

@@ -55,8 +55,9 @@ function ($articles, $user) {
         foreach ($brutto['articles'] as $k => $article) {
             $vat       = $article['vat'] / 100 + 1;
             $bruttoSum = $result['articles'][$k]['sum'];
+            $quantity  = $brutto['articles'][$k]['quantity'];
 
-            $unitPrice = $bruttoSum / $brutto['articles'][$k]['quantity'];
+            $unitPrice = $bruttoSum / $quantity;
             $unitPrice = \round($unitPrice, $Currency->getPrecision());
 
             $brutto['articles'][$k]['unitPrice']            = $unitPrice;
@@ -71,26 +72,32 @@ function ($articles, $user) {
             $Discount = ArticleDiscount::unserialize($article['discount']);
 
             if ($Discount->getCalculation() !== QUI\ERP\Accounting\Calc::CALCULATION_COMPLEMENT) {
-                $discount  = $bruttoSum * ($Discount->getValue() / 100);
-                $discount  = \round($discount, $Currency->getPrecision());
-                $bruttoSum = $bruttoSum - $discount;
+                $bruttoUnit     = $result['articles'][$k]['unitPrice'] * $vat;
+                $discount       = $bruttoUnit * ($Discount->getValue() / 100);
+                $uniqueDiscount = \round($discount, $Currency->getPrecision());
 
                 $brutto['articles'][$k]['discount']         = $Discount->getValue().'%';
                 $brutto['articles'][$k]['display_discount'] = $Discount->getValue().'%';
-                $brutto['articles'][$k]['display_sum']      = $Currency->format($bruttoSum);
-                $brutto['articles'][$k]['sum']              = \round($bruttoSum, $Currency->getPrecision());
-                continue;
+            } else {
+                $discount       = $Discount->getValue() * $vat;
+                $discount       = \round($discount, $Currency->getPrecision());
+                $uniqueDiscount = $discount / $quantity;
+
+                $brutto['articles'][$k]['discount']         = $discount;
+                $brutto['articles'][$k]['display_discount'] = $Currency->format($discount);
             }
 
-            $discount = $Discount->getValue() * $vat;
-            $discount = \round($discount, $Currency->getPrecision());
+            $unitPrice = $brutto['articles'][$k]['unitPrice'];
+            $unitPrice = $unitPrice + $uniqueDiscount;
 
-            $bruttoSum = $bruttoSum - $discount;
+            $brutto['articles'][$k]['display_sum']          = $Currency->format($bruttoSum);
+            $brutto['articles'][$k]['sum']                  = \round($bruttoSum, $Currency->getPrecision());
+            $brutto['articles'][$k]['display_unitPrice']    = $Currency->format($unitPrice);
+            $brutto['articles'][$k]['unitPrice']            = \round($unitPrice, $Currency->getPrecision());
+            $brutto['articles'][$k]['display_quantity_sum'] = $Currency->format($unitPrice * $quantity);
+            $brutto['articles'][$k]['quantity_sum']         = $unitPrice * $quantity;
 
-            $brutto['articles'][$k]['discount']         = $discount;
-            $brutto['articles'][$k]['display_discount'] = $Currency->format($discount);
-            $brutto['articles'][$k]['display_sum']      = $Currency->format($bruttoSum);
-            $brutto['articles'][$k]['sum']              = \round($bruttoSum, $Currency->getPrecision());
+            // display_quantity_sum;
         }
 
         $result['brutto'] = $brutto;

bin/backend/controls/articles/Article.js

@@ -393,12 +393,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Article', [
                 setElement(self.$Price, price);
                 setElement(self.$VAT, product.vat + '%');
 
-                if (typeof self.$bruttoCalc !== 'undefined' &&
-                    typeof self.$bruttoCalc.display_quantity_sum !== 'undefined') {
-                    self.$PriceBrutto.set('html', self.$bruttoCalc.display_quantity_sum);
-                    self.$PriceBrutto.set('data-value', self.$bruttoCalc.quantity_sum);
-                }
-
                 if (typeof self.$bruttoCalc !== 'undefined' &&
                     typeof self.$bruttoCalc.display_discount !== 'undefined') {
                     self.$DiscountBrutto.set('html', self.$bruttoCalc.display_discount);
@@ -420,6 +414,12 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Article', [
                     self.$UnitPriceBrutto.set('data-value', self.$bruttoCalc.unitPrice);
                 }
 
+                if (typeof self.$bruttoCalc !== 'undefined' &&
+                    typeof self.$bruttoCalc.display_quantity_sum !== 'undefined') {
+                    self.$PriceBrutto.set('html', self.$bruttoCalc.display_quantity_sum);
+                    self.$PriceBrutto.set('data-value', self.$bruttoCalc.quantity_sum);
+                }
+
                 self.hideLoader();
                 self.fireEvent('calc', [self]);
 

src/QUI/ERP/Accounting/Calc.php

@@ -434,19 +434,22 @@ public function calcArticlePrice(Article $Article, $callback = false)
         }
 
         // discounts
-        $Discount = $Article->getDiscount();
+        $Discount             = $Article->getDiscount();
+        $nettoPriceNotRounded = $Article->getUnitPriceUnRounded()->getValue();
 
         if ($Discount) {
             switch ($Discount->getCalculation()) {
                 // einfache Zahl, Währung --- kein Prozent
                 case Calc::CALCULATION_COMPLEMENT:
-                    $nettoPrice = $nettoPrice - ($Discount->getValue() / $Article->getQuantity());
+                    $nettoPrice           = $nettoPrice - ($Discount->getValue() / $Article->getQuantity());
+                    $nettoPriceNotRounded = $nettoPriceNotRounded - ($Discount->getValue() / $Article->getQuantity());
                     break;
 
                 // Prozent Angabe
                 case Calc::CALCULATION_PERCENTAGE:
-                    $percentage = $Discount->getValue() / 100 * $nettoPrice;
-                    $nettoPrice = $nettoPrice - $percentage;
+                    $percentage           = $Discount->getValue() / 100 * $nettoPrice;
+                    $nettoPrice           = $nettoPrice - $percentage;
+                    $nettoPriceNotRounded = $nettoPriceNotRounded - $percentage;
                     break;
             }
         }
@@ -456,7 +459,6 @@ public function calcArticlePrice(Article $Article, $callback = false)
 
         if (!$isNetto) {
             // korrektur rechnung / 1 cent problem
-            $nettoPriceNotRounded = $Article->getUnitPriceUnRounded()->getValue();
             $checkBrutto          = $nettoPriceNotRounded * ($vat / 100 + 1);
             $checkBrutto          = \round($checkBrutto, $Currency->getPrecision());