[-] 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
This commit is contained in:
rGaillard
2012-07-13 13:07:58 +00:00
parent cab8b2b251
commit f7ffb002df
+1 -1
View File
@@ -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