Merge branch 'dev'

backend/controllers/DistributionController.php

                                                         $productUnit = 'piece' ;
                                                 }
                                                 else {
-                                                        $productUnit .= $product->unit ;
+                                                        $productUnit = $product->unit ;
                                                 }
 
                                                 $productName .= ' (' . Product::strUnit($productUnit, 'wording_short', true) . ')';