Merge branch 'develop'

backend/controllers/DistributionController.php

@@ -608,7 +608,9 @@ class DistributionController extends BackendController
         $orderOverride = $orderModule->getBuilder()->instanciateOrderFromProductOrdersArray($productOrderArray, $order);
         foreach($productOrderArray as $idProduct => $productOrder) {
             $product = $productModule->getRepository()->findOneProductById($idProduct);
-            $productOrderArray[$idProduct]['quantity_remaining'] = $orderModule->getResolver()->getProductQuantityRemaining($product, $distribution, $orderOverride);
+            if($product) {
+                $productOrderArray[$idProduct]['quantity_remaining'] = $orderModule->getResolver()->getProductQuantityRemaining($product, $distribution, $orderOverride);
+            }
         }
 
         return $productOrderArray;