// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 08:57:51 +00:00
parent 9619b93c73
commit e62be3d793
41 changed files with 263 additions and 191 deletions
@@ -75,7 +75,7 @@ class StatsStock extends Module
 					FROM '._DB_PREFIX_.'product_attribute pa WHERE p.id_product = pa.id_product
 				), p.wholesale_price * p.quantity) as stockvalue
 				FROM '._DB_PREFIX_.'product p
-				'.$this->context->shop->sqlAsso('product', 'p', true).'
+				'.$this->context->shop->sqlAsso('product', 'p').'
 				INNER JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$cookie->id_lang.')
 				WHERE 1 = 1
 				'.$filter;