Merge branch 'next-1.x' into 111-feat-rework-order-page

src/QUI/ERP/Order/EventHandling.php

@@ -275,9 +275,9 @@ public static function onQuiqqerInvoiceTemporaryInvoicePostEnd(
         QUI\ERP\Accounting\Invoice\Invoice $Invoice
     ) {
         try {
-            $Order = Handler::getInstance()->getOrderByHash($Invoice->getHash());
+            $Order = Handler::getInstance()->getOrderByHash($Invoice->getGlobalProcessId());
 
-            if ($Order->isPosted()) {
+            if ($Order->hasInvoice() && $Order->getInvoice() instanceof QUI\ERP\Accounting\Invoice\Invoice) {
                 return;
             }
 

src/QUI/ERP/Order/Order.php

@@ -514,7 +514,14 @@ protected function getDataForSaving()
         $invoiceId = null;
 
         if ($this->hasInvoice()) {
-            $invoiceId = $this->getInvoice()->getCleanId();
+            $Invoice = $this->getInvoice();
+
+            if (
+                class_exists('QUI\ERP\Accounting\Invoice\Invoice')
+                && $Invoice instanceof QUI\ERP\Accounting\Invoice\Invoice
+            ) {
+                $invoiceId = $Invoice->getCleanId();
+            }
         }
 
         // currency exchange rate