Merge branch 'dev'

src/QUI/ERP/Shipping/Rules/ShippingRule.php

@@ -365,7 +365,8 @@ public function canUsedInOrder($Order)
         }
 
         foreach ($articleList as $Article) {
-            $aid = $Article->getId();
+            $aid             = $Article->getId();
+            $articleQuantity = $Article->getQuantity();
 
             // get product because of units
             try {
@@ -387,7 +388,7 @@ public function canUsedInOrder($Order)
                         $articleUnits[$unitId] = 0;
                     }
 
-                    $articleUnits[$unitId] = $articleUnits[$unitId] + $weight;
+                    $articleUnits[$unitId] = $articleUnits[$unitId] + ($weight * $articleQuantity);
 
                     $debugUnits[$unitId] = [
                         'field'  => $Weight->getTitle(),