Merge branch 'dev'

backend/controllers/CommandeController.php

@@ -493,7 +493,9 @@ class CommandeController extends BackendController {
             $key = $ppv->id_production . '-' . $ppv->id_point_vente;
             if ($ppv->livraison == 1)
                 $production_point_vente->productions_point_vente[] = $key;
-            $arr_productions_point_vente[$key] = Html::encode($ppv->pointVente->nom);
+            if(isset($ppv->pointVente) && strlen($ppv->pointVente->nom)) {
+                $arr_productions_point_vente[$key] = Html::encode($ppv->pointVente->nom);
+            }
         }
 
         $datas = [

backend/controllers/PointVenteController.php

@@ -117,7 +117,6 @@ class PointVenteController extends BackendController {
         $users = User::findBy()
                 ->orderBy('nom ASC')
                 ->all();
-
         return [
             'users' => $users
         ];
@@ -132,7 +131,7 @@ class PointVenteController extends BackendController {
     public function actionDelete($id) {
         $this->findModel($id)->delete();
         PointVenteUser::deleteAll(['id_point_vente' => $id]);
-
+        ProductionPointVente::deleteAll(['id_point_vente' => $id]) ;
         return $this->redirect(['index']);
     }