Merge branch 'dev'

ajax/calcNettoPrice.php

@@ -24,8 +24,19 @@ function ($price, $formatted, $vat) {
         $price = QUI\ERP\Money\Price::validatePrice($price);
 
         if (empty($vat)) {
-            $Area    = QUI\ERP\Defaults::getArea();
-            $TaxType = TaxUtils::getTaxTypeByArea($Area);
+            $Area = QUI\ERP\Defaults::getArea();
+
+            try {
+                $TaxType = TaxUtils::getTaxTypeByArea($Area);
+            } catch (QUI\Exception $Exception) {
+                QUI::getMessagesHandler()->addError($Exception->getMessage());
+
+                if (isset($formatted) && $formatted) {
+                    return QUI\ERP\Defaults::getCurrency()->format($price);
+                }
+
+                return $price;
+            }
 
             if ($TaxType instanceof TaxType) {
                 $TaxEntry = TaxUtils::getTaxEntry($TaxType, $Area);

bin/backend/controls/articles/windows/PriceBrutto.js

@@ -97,7 +97,16 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
             }, {
                 'package': 'quiqqer/erp',
                 price    : this.getContent().getElement('input').value,
-                vat      : this.getAttribute('vat')
+                vat      : this.getAttribute('vat'),
+                onError  : function (err) {
+                    console.error(err);
+
+                    QUI.getMessageHandler().then(function (MH) {
+                        MH.addError(err.getMessage());
+                    });
+
+                    self.close();
+                }
             });
         }
     });