From 24630365bdcf370626abd9f0e8072b44add797ea Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Tue, 12 Jun 2012 08:28:22 +0000
Subject: [PATCH] [-] BO: fix PSCFV-2778 display bad stock with
 product_attributes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15978 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/default/template/controllers/orders/form.tpl      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index ce42597c4..5b09245f4 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -563,6 +563,7 @@
 						products_found += '<option '+(this.combinations.length > 0 ? 'rel="'+this.qty_in_stock+'"' : '')+' value="'+this.id_product+'">'+this.name+(this.combinations.length == 0 ? ' - '+this.formatted_price : '')+'</option>';
 						attributes_html += '<select class="id_product_attribute" id="ipa_'+this.id_product+'" style="display:none;">';
 						var id_product = this.id_product;
+						stock[id_product] = new Array();
 						if (this.customizable == '1')
 						{
 							customization_html += '<fieldset class="width3"><legend>{l s='Customization'}</legend><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
@@ -587,10 +588,10 @@
 						
 						$.each(this.combinations, function() {
 							attributes_html += '<option rel="'+this.qty_in_stock+'" '+(this.default_on == 1 ? 'selected="selected"' : '')+' value="'+this.id_product_attribute+'">'+this.attributes+' - '+this.formatted_price+'</option>';
+							stock[id_product][this.id_product_attribute] = this.qty_in_stock;
 						});
 						
-						stock[this.id_product] = this.stock;
-
+						stock[this.id_product][0] = this.stock;
 						attributes_html += '</select>';
 					});
 					products_found += '</select>';