From 9032e37b38de0cccde85c7e60434e7c88212f83d Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Mon, 5 Sep 2011 13:53:39 +0000
Subject: [PATCH] // Fix stock for customizable features

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8340 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Product.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 91ed1e6e2..2d13c3474 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2050,7 +2050,9 @@ class ProductCore extends ObjectModel
 		$sql = (($innerJoin) ? ' INNER ' : ' LEFT ').'JOIN '._DB_PREFIX_.'stock stock ON stock.id_product = '.pSQL($productAlias).'.id_product';
 		if (!is_null($productAttribute))
 		{
-			if (is_numeric($productAttribute))
+			if (!Combination::isFeatureActive())
+				$sql .= ' AND stock.id_product_attribute = 0';
+			else if (is_numeric($productAttribute))
 				$sql .= ' AND stock.id_product_attribute = '.$productAttribute;
 			else if (is_string($productAttribute))
 				$sql .= ' AND stock.id_product_attribute = IFNULL('.pSQL($productAttribute).'.id_product_attribute, 0)';
@@ -2524,12 +2526,10 @@ class ProductCore extends ObjectModel
 		if (Combination::isFeatureActive())
 		{
 			$sql['join'] .= '
-				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.`id_product` = p.`id_product`
-				'.Product::sqlStock('p', 'pa', false, $context->shop);
+				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.`id_product` = p.`id_product`';
 			$sql['where'] .= 'OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
 		}
-		else 
-			$sql['join'] .= Product::sqlStock('p', null, false, $context->shop);
+		$sql['join'] .= Product::sqlStock('p', 'pa', false, $context->shop);
 		
 		$result = Db::getInstance()->ExecuteS(Tools::buildQuery($sql));