[Administration] Distributions > Édition commande : correctif changement de prix #1259

backend/controllers/DistributionController.php

@@ -209,8 +209,11 @@ class DistributionController extends BackendController
 
             $jsonProduct['quantity_form'] = 0;
 
-            if (!$product->taxRate) {
-                $jsonProduct['taxRate'] = $this->getProducerCurrent()->taxRate;
+            if ($product->taxRate) {
+                $jsonProduct['taxRate'] = $product->taxRate->getAttributes();
+            }
+            else {
+                $jsonProduct['taxRate'] = $this->getProducerCurrent()->taxRate->getAttributes();
             }
 
             $jsonProductsArray[] = $jsonProduct;

backend/controllers/OrderController.php

@@ -957,8 +957,10 @@ class OrderController extends BackendController
                         $productOrder->quantity = $quantity;
                         $productOrder->price = $dataProductOrder->price;
 
-                        if($dataProductOrder->invoice_price && $dataProductOrder->invoice_price != $dataProductOrder->price) {
-                            //die('invoice price : '.$dataProductOrder->invoice_price);
+                        if(isset($dataProductOrder->invoice_price)
+                            && $dataProductOrder->invoice_price
+                            && $dataProductOrder->invoice_price != $dataProductOrder->price) {
+                            
                             $productOrder->invoice_price = $dataProductOrder->invoice_price;
                         }
                     } else {