Merge branch 'dev'

common/models/Distribution.php

                 if($ordersArray) {
                         foreach($ordersArray as $order) {
                                 foreach($order->productOrder as $productOrder) {
-                                        $productOrder->price = $product->price ;
-                                        $productOrder->save() ;
+                                        if($order->productOrder->id_product == $product->id) {
+                                                $productOrder->price = $product->price ;
+                                                $productOrder->save() ;
+                                        }
                                 }
                         }
                 }