// merge 1.4 => 1.5 (bug #PSCFI-4954)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13453 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 10:01:37 +00:00
parent 2145cd543b
commit f437fe1106
1 changed files with 2 additions and 2 deletions
@@ -429,7 +429,7 @@ class AdminOrdersControllerCore extends AdminController
 						foreach ($customizationList as $key => $id_order_detail)
 						{
 							$full_product_list[$id_order_detail] = $id_order_detail;
-							$full_quantity_list[$id_order_detail] = $customizationQtyList[$key];
+							$full_quantity_list[$id_order_detail] += $customizationQtyList[$key];
 						}

 					if ($productList || $customizationList)
@@ -975,7 +975,7 @@ class AdminOrdersControllerCore extends AdminController
 						else
 							break;
 					}
-					
+
 					if ($res)
 					{
 						foreach ($cart_rules as $id_order_invoice => $cart_rule)