From 7fca32e3dcff91d8f125cb1a438fdb3dcc406cc7 Mon Sep 17 00:00:00 2001 From: vChabot Date: Thu, 26 Jul 2012 13:52:05 +0000 Subject: [PATCH] [-] BO : BugFix : #PSCFV-3334 : Price Rules : Catalog Price Rules - In condition group when you want to make a condition with categories, in the list appears every categories from every stores git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16584 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Category.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/Category.php b/classes/Category.php index 5b09c9159..1b59c9f2a 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -475,9 +475,11 @@ class CategoryCore extends ObjectModel SELECT c.`id_category`, cl.`name` FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Shop::addSqlRestrictionOnLang('cl').') + '.Shop::addSqlAssociation('category', 'c').' WHERE cl.`id_lang` = '.(int)$id_lang.' + AND c.`id_category` != '.Configuration::get('PS_ROOT_CATEGORY').'svn update GROUP BY c.id_category - ORDER BY c.`position`'); + ORDER BY c.`id_category`, category_shop.`position`'); } public function getShopID()