// improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2011-12-13 13:37:59 +00:00
parent 659cc9235a
commit 225c8523e9
4 changed files with 45 additions and 50 deletions
-15
View File
@@ -298,21 +298,6 @@ class OrderCore extends ObjectModel
$this->_taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
}
public function add($autodate = true, $null_values = false)
{
if (Context::getContext()->shop->getGroup()->share_order == true)
$this->id_shop = null;
return parent::add($autodate);
}
public function update($null_values = false)
{
if (Context::getContext()->shop->getGroup()->share_order == true)
$this->id_shop = null;
$return = parent::update();
return $return;
}
public function getTaxCalculationMethod()
{
return (int)($this->_taxCalculationMethod);