Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -627,19 +627,10 @@ class DistributionController extends BackendController
                 $productsHasQuantity = [] ;
                 $cpt = 1 ;
                 foreach ($productsArray as $product) {
-                    $productsHasQuantity[$product->id] = 0 ;
-                    foreach(Product::$unitsArray as $unit => $dataUnit) {
-                        $quantity = Order::getProductQuantity($product->id, $ordersArray, true, $unit);
-                        if($quantity) {
-                            $productsHasQuantity[$product->id] += $quantity ;
-                        }
-                    }
-                    if($productsHasQuantity[$product->id] > 0) {
-                        $theUnit = Product::strUnit($product->unit, 'wording_short', true) ;
-                        $theUnit = ($theUnit == 'p.') ? '' : ' ('.$theUnit.')' ;
-                        $productsNameArray[] = $product->name .$theUnit ;
-                        $productsIndexArray[$product->id] = $cpt ++ ;
-                    }
+                    $theUnit = Product::strUnit($product->unit, 'wording_short', true) ;
+                    $theUnit = ($theUnit == 'p.') ? '' : ' ('.$theUnit.')' ;
+                    $productsNameArray[] = $product->name .$theUnit ;
+                    $productsIndexArray[$product->id] = $cpt ++ ;
                 }
                 $datas[] = $productsNameArray ;
 
@@ -680,7 +671,7 @@ class DistributionController extends BackendController
 
                         // total point de vente
                         $totalsPointSaleArray = $this->_totalReportCSV(
-                            'Total', 
+                            'Total point de vente', 
                             $pointSale->orders, 
                             $productsArray, 
                             $productsIndexArray