From e0ea561402cd88397f69798cb42858e541db0d08 Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Mon, 20 Feb 2012 10:01:37 +0000
Subject: [PATCH] // merge 1.4 => 1.5 (bug #PSCFI-4954)

---
 controllers/admin/AdminOrdersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 5b6f48d00..71cf01d6a 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -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)