Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -1267,7 +1267,9 @@ class DistributionController extends BackendController
                                 $orders = Order::searchAll([
                                         'distribution.date' => $date,
                                         'order.tiller_synchronization' => 1
-                                ]);
+                                ], [
+                                        'conditions' => 'date_delete IS NULL'
+                               ]);
 
                                 $strDate = date('Y-m-d\T12:i:s+0000', strtotime($date) + 1);
 

common/helpers/Tiller.php

@@ -79,6 +79,8 @@ class Tiller
                         $ordersOpendistrib = Order::searchAll([
                                 'distribution.date' => $date,
                                 'order.tiller_synchronization' => 1
+                        ], [
+                              'conditions' => 'date_delete IS NULL'
                         ]);
 
                         $ordersOpendistribSynchro = [];