// Merge -> revision 8734

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-23 14:06:47 +00:00
parent 4181a8ea5b
commit 7c85e104de
4 changed files with 20 additions and 12 deletions
+2 -2
View File
@@ -1957,7 +1957,7 @@ class ProductCore extends ObjectModel
*/
public function getPrice($tax = true, $id_product_attribute = NULL, $decimals = 6, $divisor = NULL, $only_reduc = false, $usereduc = true, $quantity = 1)
{
return self::getPriceStatic((int)($this->id), $tax, $id_product_attribute, $decimals, $divisor, $only_reduc, $usereduc, $quantity);
return Product::getPriceStatic((int)($this->id), $tax, $id_product_attribute, $decimals, $divisor, $only_reduc, $usereduc, $quantity);
}
public function getIdProductAttributeMostExpensive()
@@ -1975,7 +1975,7 @@ class ProductCore extends ObjectModel
public function getPriceWithoutReduct($notax = false, $id_product_attribute = false)
{
return self::getPriceStatic((int)($this->id), !$notax, $id_product_attribute, 6, NULL, false, false);
return Product::getPriceStatic((int)($this->id), !$notax, $id_product_attribute, 6, NULL, false, false);
}
/**