[-] 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
This commit is contained in:
vChabot
2012-07-26 13:52:05 +00:00
parent 13b93ddaef
commit 7fca32e3dc
+3 -1
View File
@@ -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()