diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 98ab49ddf..25596401e 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -588,7 +588,7 @@
 							stock[id_product][this.id_product_attribute] = this.qty_in_stock;
 						});
 
-						stock[this.id_product][0] = this.stock;
+						stock[this.id_product][0] = this.stock[0];
 						attributes_html += '</select>';
 					});
 					products_found += '</select>';
@@ -597,7 +597,7 @@
 					$('#products_found #customization_list').contents().find('body').html(customization_html);
 					display_product_attributes();
 					display_product_customizations();
-					$('#id_product').click();
+					$('#id_product').change();
 				}
 				else
 				{
diff --git a/classes/Product.php b/classes/Product.php
index b42ed347d..7b5ab6dfe 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4748,9 +4748,6 @@ class ProductCore extends ObjectModel
 		if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && is_null($manager))
 			$manager = StockManagerFactory::getManager();
 
-		if (is_null($id_shop))
-			$id_shop = Context::getContext()->shop->id;
-
 		if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Product::usesAdvancedStockManagement($id_product) &&
 			StockAvailable::dependsOnStock($id_product, $id_shop))
 			return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true);
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index d35a2edc9..724f804b8 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1379,7 +1379,7 @@ class AdminOrdersControllerCore extends AdminController
 				$productObj = new Product((int)$product['id_product'], false, (int)$this->context->language->id);
 				$combinations = array();
 				$attributes = $productObj->getAttributesGroups((int)$this->context->language->id);
-				$product['qty_in_stock'] = StockAvailable::getQuantityAvailableByProduct((int)$product['id_product'], 0, (int)$this->context->shop->id);
+				
 				// Tax rate for this customer
 				if (Tools::isSubmit('id_address'))
 					$product['tax_rate'] = $productObj->getTaxesRate(new Address(Tools::getValue('id_address')));
@@ -1420,7 +1420,6 @@ class AdminOrdersControllerCore extends AdminController
 
 				$product['stock'][0] = Product::getRealQuantity($product['id_product'], 0, 0);
 
-
 				foreach ($combinations as &$combination)
 					$combination['attributes'] = rtrim($combination['attributes'], ' - ');
 				$product['combinations'] = $combinations;