diff --git a/classes/Product.php b/classes/Product.php
index 25d8685fe..719d72645 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -519,7 +519,7 @@ class ProductCore extends ObjectModel
 					FROM '._DB_PREFIX_.'product_attribute pa'
 					.($minimumQuantity > 0 ? Product::sqlStock('pa', 'pa') : '').
 					' WHERE pa.id_product = '.(int)$id_product
-						.($minimumQuantity > 0 ? ' AND s.quantity >= '.(int)$minimumQuantity : '');
+						.($minimumQuantity > 0 ? ' AND stock.quantity >= '.(int)$minimumQuantity : '');
 			$result = Db::getInstance()->getRow($sql);
 		}
 			
@@ -1290,7 +1290,7 @@ class ProductCore extends ObjectModel
 	*/
 	public function getAttributeCombinaisons($id_lang)
 	{
-		$sql = 'SELECT pa.*, ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, al.`name` AS attribute_name, a.`id_attribute`, pa.`unit_price_impact`, s.quantity
+		$sql = 'SELECT pa.*, ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, al.`name` AS attribute_name, a.`id_attribute`, pa.`unit_price_impact`, stock.quantity
 				FROM `'._DB_PREFIX_.'product_attribute` pa
 				LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON pac.`id_product_attribute` = pa.`id_product_attribute`
 				LEFT JOIN `'._DB_PREFIX_.'attribute` a ON a.`id_attribute` = pac.`id_attribute`
@@ -1298,6 +1298,7 @@ class ProductCore extends ObjectModel
 				LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)$id_lang.')
 				LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND agl.`id_lang` = '.(int)$id_lang.')
 				LEFT JOIN '._DB_PREFIX_.'stock s ON pa.id_product = s.id_product AND pa.id_product_attribute = s.id_product_attribute
+				'.Product::sqlStock('pa', 'pa').'
 				WHERE pa.`id_product` = '.(int)$this->id.'
 				ORDER BY pa.`id_product_attribute`';
 		return Db::getInstance()->ExecuteS($sql);
@@ -1530,12 +1531,12 @@ class ProductCore extends ObjectModel
 			return (int)($result['nb']);
 		}
 
-		$sql = 'SELECT p.*, s.quantity, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
+		$sql = 'SELECT p.*, stock.quantity, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
 					pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
 					DATEDIFF(p.`date_add`, DATE_SUB(NOW(), INTERVAL '.(Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).' DAY)) > 0 AS new
 				FROM `'._DB_PREFIX_.'product` p
-				LEFT JOIN '._DB_PREFIX_.'product_shop ps ON (ps.id_product = p.id_product)
 				'.Shop::sqlAsso('product', 'p', $context).'
+				'.Product::sqlStock('p', 0, false, $context).'
 				LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Shop::sqlLang('pl', $context).')
 				LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
 				LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
diff --git a/classes/StockMvt.php b/classes/StockMvt.php
index 0956aaeda..59e7b249b 100755
--- a/classes/StockMvt.php
+++ b/classes/StockMvt.php
@@ -88,7 +88,7 @@ class StockMvtCore extends ObjectModel
 	public static function addMissingMvt($id_employee)
 	{
 		// Search missing stock movement on products without attributes
-		$sql = 'SELECT s.id_stock, (s.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
+		$sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
 				FROM '._DB_PREFIX_.'product p
 				'.Product::sqlStock('p', null, true).'
 				LEFT JOIN '._DB_PREFIX_.'stock_mvt sm ON s.id_stock = sm.id_stock
@@ -102,9 +102,9 @@ class StockMvtCore extends ObjectModel
 		$products_without_attributes = Db::getInstance()->ExecuteS($sql);
 
 		// Search missing stock movement on products with attributes
-		$sql = 'SELECT s.id_stock, (s.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
+		$sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty
 				FROM '._DB_PREFIX_.'product_attribute pa
-				INNER JOIN '._DB_PREFIX_.'stock s ON s.id_product = pa.id_product AND s.id_product_attribute = pa.id_product_attribute
+				'.Product::sqlStock('pa', 'pa', true).'
 				LEFT JOIN '._DB_PREFIX_.'stock_mvt sm ON s.id_stock = sm.id_stock
 				WHERE s.id_product_attribute > 0
 					AND (
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 3f5e94533..e8b06f4ed 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -427,9 +427,9 @@ class BlockLayered extends Module
 		foreach ($subCategories AS $subcategory)
 				$whereC .= ' cp.`id_category` = '.(int)$subcategory['id_category'].' OR ';
 
-		$whereC = rtrim($whereC, 'OR ')'';
+		$whereC = rtrim($whereC, 'OR ');
 		$productsSQL = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-		SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`weight`, s.quantity,
+		SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`weight`, stock.quantity,
 		(SELECT GROUP_CONCAT(`id_category`) FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_product` = p.`id_product`) as ids_cat,
 			(SELECT GROUP_CONCAT(`id_feature_value`) FROM `'._DB_PREFIX_.'feature_product` fp WHERE fp.`id_product` = p.`id_product`) as ids_feat,
 			(SELECT GROUP_CONCAT(DISTINCT(pac.`id_attribute`))