From 15a612d094a8f2f404be87f476f3f7de49d63754 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 24 Feb 2012 09:41:31 +0000
Subject: [PATCH] // Fix tax_rules_group install on carriers and products

---
 .../data/xml/carrier_tax_rules_group_shop.xml   |  7 +++----
 .../data/xml/product_tax_rules_group_shop.xml   | 17 -----------------
 .../apple/data/carrier_tax_rules_group_shop.xml | 11 +++++++++++
 .../apple/data/product_tax_rules_group_shop.xml | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100755 install-dev/data/xml/product_tax_rules_group_shop.xml
 create mode 100644 install-dev/fixtures/apple/data/carrier_tax_rules_group_shop.xml
 create mode 100755 install-dev/fixtures/apple/data/product_tax_rules_group_shop.xml

diff --git a/install-dev/data/xml/carrier_tax_rules_group_shop.xml b/install-dev/data/xml/carrier_tax_rules_group_shop.xml
index f8172236e..371a5462c 100755
--- a/install-dev/data/xml/carrier_tax_rules_group_shop.xml
+++ b/install-dev/data/xml/carrier_tax_rules_group_shop.xml
@@ -2,11 +2,10 @@
 <entity_carrier_tax_rules_group_shop>
   <fields primary="id_carrier,id_tax_rules_group,id_shop">
     <field name="id_carrier" relation="carrier"/>
-    <field name="id_tax_rules_group" relation="tax_rules_group"/>
-    <field name="id_shop" relation="shop"/>
+    <field name="id_tax_rules_group"/>
+    <field name="id_shop"/>
   </fields>
   <entities>
-    <carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_1_1_1" id_carrier="carrier_1" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_2_1_1" id_carrier="carrier_2" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
+    <carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_1_1_1" id_carrier="carrier_1" id_tax_rules_group="1" id_shop="1"/>
   </entities>
 </entity_carrier_tax_rules_group_shop>
diff --git a/install-dev/data/xml/product_tax_rules_group_shop.xml b/install-dev/data/xml/product_tax_rules_group_shop.xml
deleted file mode 100755
index 2b07d5a87..000000000
--- a/install-dev/data/xml/product_tax_rules_group_shop.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<entity_product_tax_rules_group_shop>
-  <fields primary="id_product,id_tax_rules_group,id_shop">
-    <field name="id_product" relation="product"/>
-    <field name="id_tax_rules_group" relation="tax_rules_group"/>
-    <field name="id_shop" relation="shop"/>
-  </fields>
-  <entities>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_1_1_1" id_product="product_1" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_2_1_1" id_product="product_2" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_3_1_1" id_product="product_3" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_4_1_1" id_product="product_4" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_5_1_1" id_product="product_5" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_6_1_1" id_product="product_6" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-    <product_tax_rules_group_shop id="product_tax_rules_group_shop_7_1_1" id_product="product_7" id_tax_rules_group="tax_rules_group_1" id_shop="shop_1"/>
-  </entities>
-</entity_product_tax_rules_group_shop>
diff --git a/install-dev/fixtures/apple/data/carrier_tax_rules_group_shop.xml b/install-dev/fixtures/apple/data/carrier_tax_rules_group_shop.xml
new file mode 100644
index 000000000..71c21383b
--- /dev/null
+++ b/install-dev/fixtures/apple/data/carrier_tax_rules_group_shop.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<entity_carrier_tax_rules_group_shop>
+  <fields primary="id_carrier,id_tax_rules_group,id_shop">
+    <field name="id_carrier" relation="carrier"/>
+    <field name="id_tax_rules_group"/>
+    <field name="id_shop"/>
+  </fields>
+  <entities>
+    <carrier_tax_rules_group_shop id="carrier_tax_rules_group_shop_2_1_1" id_carrier="My_carrier" id_tax_rules_group="1" id_shop="1"/>
+  </entities>
+</entity_carrier_tax_rules_group_shop>
diff --git a/install-dev/fixtures/apple/data/product_tax_rules_group_shop.xml b/install-dev/fixtures/apple/data/product_tax_rules_group_shop.xml
new file mode 100755
index 000000000..d7399b36a
--- /dev/null
+++ b/install-dev/fixtures/apple/data/product_tax_rules_group_shop.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<entity_product_tax_rules_group_shop>
+  <fields primary="id_product,id_tax_rules_group,id_shop">
+    <field name="id_product" relation="product"/>
+    <field name="id_tax_rules_group"/>
+    <field name="id_shop"/>
+  </fields>
+  <entities>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_1_1_1" id_product="iPod_Nano" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_2_1_1" id_product="iPod_shuffle" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_3_1_1" id_product="MacBook_Air" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_4_1_1" id_product="MacBook" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_5_1_1" id_product="iPod_touch" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_6_1_1" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_tax_rules_group="1" id_shop="1"/>
+    <product_tax_rules_group_shop id="product_tax_rules_group_shop_7_1_1" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_tax_rules_group="1" id_shop="1"/>
+  </entities>
+</entity_product_tax_rules_group_shop>