Merge tag 'hotfix_1330' into develop

hotfix_1330

backend/controllers/DistributionController.php

@@ -569,7 +569,7 @@ class DistributionController extends BackendController
             }
             foreach ($order->productOrder as $productOrder) {
                 $invoicePrice = $productManager->getPrice($productOrder->product, [
-                    'user' => $order->user ?: null,
+                    'user' => $orderManager->getUserForInvoicing($order),
                     'point_sale' => $order->pointSale,
                     'user_producer' => $userProducer,
                     'quantity' => $productOrder->quantity

common/logic/Order/Order/Service/OrderSolver.php

@@ -476,4 +476,21 @@ class OrderSolver extends AbstractService implements SolverInterface
 
         return $str;
     }
+
+    public function getUserForInvoicing(Order $order): ?User
+    {
+        if($order->invoice && $order->invoice->user) {
+            return $order->invoice->user;
+        }
+
+        if($order->deliveryNote && $order->deliveryNote->user) {
+            return $order->deliveryNote->user;
+        }
+
+        if($order->user) {
+            return $order->user;
+        }
+
+        return null;
+    }
 }