Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/order into dev

database.xml

@@ -37,7 +37,7 @@
 
             <field type="INT(11) NULL DEFAULT NULL">shipping_id</field>
             <field type="TEXT NULL">shipping_data</field>
-            <field type="INT NOT NULL">shipping_status</field>
+            <field type="INT NULL DEFAULT NULL">shipping_status</field>
 
             <field type="TEXT NULL">history</field>
             <field type="TEXT NULL">comments</field>

src/QUI/ERP/Order/Order.php

@@ -369,7 +369,8 @@ protected function getDataForSaving()
         }
 
         if (QUI::getPackageManager()->isInstalled('quiqqer/shipping')) {
-            $shippingStatus = $this->getShippingStatus()->getId();
+            $ShippingStatus = $this->getShippingStatus();
+            $shippingStatus = $ShippingStatus ? $ShippingStatus->getId() : null;
         }
 
         return [

src/QUI/ERP/Order/OrderInProcess.php

@@ -577,7 +577,8 @@ protected function getDataForSaving()
         }
 
         if (QUI::getPackageManager()->isInstalled('quiqqer/shipping')) {
-            $shippingStatus = $this->getShippingStatus()->getId();
+            $ShippingStatus = $this->getShippingStatus();
+            $shippingStatus = $ShippingStatus ? $ShippingStatus->getId() : null;
         }
 
         return [