From f7ffb002df6f86ee3182441a608a8c99486ff3b1 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 13 Jul 2012 13:07:58 +0000 Subject: [PATCH] [-] Core: Fix PSCFV-3138 sometime product price setted to 0 on combinations with specific prices git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16412 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Product.php b/classes/Product.php index 276b4c083..82b3f86a3 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2478,7 +2478,7 @@ class ProductCore extends ObjectModel $price = Tools::convertPrice($price, $id_currency); // Attribute price - if (is_array($result) && (!$specific_price || !$specific_price['id_product_attribute'])) + if (is_array($result) && (!$specific_price['id_product_attribute'] || $specific_price['price'] < 0)) { $attribute_price = Tools::convertPrice($result['attribute_price'] !== null ? (float)$result['attribute_price'] : 0, $id_currency); if ($id_product_attribute !== false && !is_null($id_product_attribute)) // If you want the default combination, please use NULL value instead