From ab6e72b359db339bdaf5ee4f23977ef6684b9fca Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 5 Sep 2012 15:52:14 +0000 Subject: [PATCH] [-] BO : fixed bug #PSCFV-3922 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17197 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 836c66b4c..3bf373b6b 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3514,7 +3514,7 @@ class AdminProductsControllerCore extends AdminController 'product' => $product, 'id_category' => $product->getDefaultCategory(), 'token_generator' => Tools::getAdminTokenLite('AdminAttributeGenerator'), - 'combination_exists' => (Shop::isFeatureActive() && (Shop::getContextShopGroup()->share_stock) && count(AttributeGroup::getAttributesGroups($this->context->language->id)) > 0) + 'combination_exists' => (Shop::isFeatureActive() && (Shop::getContextShopGroup()->share_stock) && count(AttributeGroup::getAttributesGroups($this->context->language->id)) > 0 && $product->hasAttributes()) )); } }