From 900e9e8148997dfc54fd8ea499b5d299dd101a96 Mon Sep 17 00:00:00 2001 From: rMalie Date: Fri, 25 Nov 2011 13:12:02 +0000 Subject: [PATCH] // Fix stock for multishop git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10661 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Product.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 55e695081..3edc825d3 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -1587,7 +1587,7 @@ class ProductCore extends ObjectModel } $sql = new DbQuery(); - $sql->select('p.*, sa.out_of_stock, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, p.`ean13`, p.`upc`, + $sql->select('p.*, stock.out_of_stock, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, p.`ean13`, p.`upc`, 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, (p.`price` * ((100 + (t.`rate`))/100)) AS orderprice'); @@ -1600,7 +1600,7 @@ class ProductCore extends ObjectModel $sql->leftJoin('tax_rule tr ON (p.`id_tax_rules_group` = tr.`id_tax_rules_group` AND tr.`id_country` = '.(int)$context->country->id.' AND tr.`id_state` = 0)'); $sql->leftJoin('tax t ON (t.`id_tax` = tr.`id_tax`)'); $sql->leftJoin('manufacturer m ON (m.`id_manufacturer` = p.`id_manufacturer`)'); - $sql->leftJoin('stock_available sa ON (sa.`id_product` = p.`id_product` AND sa.id_product_attribute = 0)'); + Product::sqlStock('p', 0, false, null, $sql); $sql->where('p.`active` = 1'); $sql->where('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');