// Fix #PSCFV-4615

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17692 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-02 13:43:31 +00:00
parent 34b062074b
commit 2084089d1a
2 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -588,7 +588,7 @@ class CartCore extends ObjectModel
((int)$this->id_customer ? (int)$this->id_customer : null),
(int)$this->id,
((int)$address_id ? (int)$address_id : null),
null,
$null,
true,
true,
$cart_shop_context
+1 -3
View File
@@ -487,10 +487,8 @@ class ProductCore extends ObjectModel
die(Tools::displayError());
self::$_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);
}
else if (Validate::isLoadedObject(Context::getContext()->customer))
self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Context::getContext()->customer->id_default_group);
else
self::$_taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id);
}
public static function getTaxCalculationMethod($id_customer = null)