Merge branch 'dev'

ajax/calcPriceFactor.php

@@ -16,7 +16,15 @@
     function ($price, $vat, $currency) {
         $Currency = CurrencyHandler::getCurrency($currency);
         $price    = Price::validatePrice($price);
-        
+
+        if (empty($vat)) {
+            $Area     = QUI\ERP\Defaults::getArea();
+            $TaxType  = QUI\ERP\Tax\Utils::getTaxTypeByArea($Area);
+            $TaxEntry = QUI\ERP\Tax\Utils::getTaxEntry($TaxType, $Area);
+
+            $vat = $TaxEntry->getValue();
+        }
+
         $nettoSum          = $price;
         $nettoSumFormatted = $Currency->format($price);
         $sum               = $price * (($vat + 100) / 100);

src/QUI/ERP/Accounting/ArticleList.php

@@ -497,6 +497,10 @@ public function addPriceFactor($PriceFactor)
                 $vat = key($this->vatArray);
             }
 
+            if ($PriceFactor->getVat()) {
+                $vat = $PriceFactor->getVat();
+            }
+
             $PriceFactor->setVat($vat);
 
             $brutto = $netto * ((100 + $vat) / 100);