// Fix tax rules group product and carriers deletion

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13967 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-03-08 13:36:45 +00:00
parent edc36a2294
commit aab9e2dedf
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -204,7 +204,7 @@ class CarrierCore extends ObjectModel
if (!parent::delete())
return false;
return (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) &&
$this->deleteTaxRulesGroup(true));
$this->deleteTaxRulesGroup(Shop::getShops(true, null, true)));
}
+1 -1
View File
@@ -682,7 +682,7 @@ class ProductCore extends ObjectModel
!$this->deleteAccessories() ||
!$this->deleteFromAccessories() ||
!$this->deleteFromSupplier() ||
!$this->deleteTaxRulesGroup(true))
!$this->deleteTaxRulesGroup(Shop::getShops(true, null, true)))
return false;
if ($id = ProductDownload::getIdFromIdProduct($this->id))