From d30e37174bc6723472aa354a62ae4c8b6d883130 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 7 Sep 2012 17:19:06 +0000 Subject: [PATCH] // Small fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17248 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminAttributeGeneratorController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminAttributeGeneratorController.php b/controllers/admin/AdminAttributeGeneratorController.php index f48b48fe6..8e94a3650 100644 --- a/controllers/admin/AdminAttributeGeneratorController.php +++ b/controllers/admin/AdminAttributeGeneratorController.php @@ -37,6 +37,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController $this->table = 'product_attribute'; $this->className = 'Product'; $this->multishop_context_group = false; + parent::__construct(); } @@ -115,7 +116,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController { $attributes = Product::getProductAttributesIds($this->product->id); foreach ($attributes as $attribute) - StockAvailable::removeProductFromStockAvailable($this->product->id, $attribute['id_product_attribute'], $this->context->shop); + StockAvailable::removeProductFromStockAvailable($this->product->id, $attribute['id_product_attribute']); } $this->product->deleteProductAttributes(); @@ -127,7 +128,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController $attributes = Product::getProductAttributesIds($this->product->id); $quantity = (int)Tools::getValue('quantity'); foreach ($attributes as $attribute) - StockAvailable::setQuantity($this->product->id, $attribute['id_product_attribute'], $quantity, $this->context->shop->id); + StockAvailable::setQuantity($this->product->id, $attribute['id_product_attribute'], $quantity); } Tools::redirectAdmin($this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations&conf=4'); } @@ -257,4 +258,4 @@ class AdminAttributeGeneratorControllerCore extends AdminController 'title' => $this->toolbar_title, )); } -} \ No newline at end of file +}