From 8c91e49e0d64beee592fe3f5a6db0ef7f616851b Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 8 Mar 2012 13:36:45 +0000
Subject: [PATCH] // Fix tax rules group product and carriers deletion

---
 classes/Carrier.php | 2 +-
 classes/Product.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Carrier.php b/classes/Carrier.php
index 22442cb91..692604712 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -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)));
 		
 	}
 
diff --git a/classes/Product.php b/classes/Product.php
index a398c06ec..d37b1e980 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -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))