Merge branch 'dev'

common/mail/orderConfirm-html.php

@@ -38,7 +38,6 @@ termes.
 
 use common\models\Producer ;
 use common\helpers\GlobalParam ;
-$producer = GlobalParam::getCurrentProducer() ;
 
 ?>
 

producer/controllers/OrderController.php

@@ -478,7 +478,8 @@ class OrderController extends ProducerBaseController
                                         'order' => $order,
                                         'pointSale' => $pointSale,
                                         'distribution' => $distribution,
-                                        'user' => $user
+                                        'user' => $user,
+                                        'producer' => $producer
                                 ]
                         ] ;