From 2ec016c32ac6d3ffcab656f17b3e27d176da94b0 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 22 Dec 2011 21:48:13 +0000
Subject: [PATCH] // Fix combinations images with new installer

---
 install-new/data/xml/configuration.xml        |  8 ++---
 install-new/fixtures/apple/data/customer.xml  |  2 +-
 .../apple/data/product_attribute_image.xml    | 36 +++++++++++++++++++
 3 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 install-new/fixtures/apple/data/product_attribute_image.xml

diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
index 3509d9367..1e4b6c900 100644
--- a/install-new/data/xml/configuration.xml
+++ b/install-new/data/xml/configuration.xml
@@ -192,13 +192,13 @@
       <value>0</value>
     </configuration>
     <configuration id="PS_1_3_UPDATE_DATE" name="PS_1_3_UPDATE_DATE">
-      <value>2011-12-22 22:11:55</value>
+      <value>2011-12-22 22:46:00</value>
     </configuration>
     <configuration id="PS_PRICE_ROUND_MODE" name="PS_PRICE_ROUND_MODE">
       <value>2</value>
     </configuration>
     <configuration id="PS_1_3_2_UPDATE_DATE" name="PS_1_3_2_UPDATE_DATE">
-      <value>2011-12-22 22:11:55</value>
+      <value>2011-12-22 22:46:00</value>
     </configuration>
     <configuration id="PS_CONDITIONS_CMS_ID" name="PS_CONDITIONS_CMS_ID">
       <value>3</value>
@@ -342,7 +342,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_IMG_UPDATE_TIME" name="PS_IMG_UPDATE_TIME">
-      <value>1324588315</value>
+      <value>1324590360</value>
     </configuration>
     <configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
       <value>1</value>
@@ -861,7 +861,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
-      <value>19</value>
+      <value>2</value>
     </configuration>
   </entities>
 </entity_configuration>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
index 5311b6f0e..17bfeb141 100644
--- a/install-new/fixtures/apple/data/customer.xml
+++ b/install-new/fixtures/apple/data/customer.xml
@@ -19,7 +19,7 @@
     <field name="is_guest"/>
   </fields>
   <entities>
-    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="628216ba07b6853236426156c780dda2" last_passwd_gen="2011-12-22 22:11:55" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
+    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="e854ea98ca70113b5f2749044ed5e812" last_passwd_gen="2011-12-22 22:46:00" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>
diff --git a/install-new/fixtures/apple/data/product_attribute_image.xml b/install-new/fixtures/apple/data/product_attribute_image.xml
new file mode 100644
index 000000000..0d235050a
--- /dev/null
+++ b/install-new/fixtures/apple/data/product_attribute_image.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<entity_product_attribute_image>
+  <fields primary="id_product_attribute, id_image">
+    <field name="id_product_attribute" relation="product_attribute"/>
+    <field name="id_image" relation="image"/>
+  </fields>
+  <entities>
+    <product_attribute_image id="product_attribute_image_12_0" id_product_attribute="product_attribute_12" id_image=""/>
+    <product_attribute_image id="product_attribute_image_13_0" id_product_attribute="product_attribute_13" id_image=""/>
+    <product_attribute_image id="product_attribute_image_14_0" id_product_attribute="product_attribute_14" id_image=""/>
+    <product_attribute_image id="product_attribute_image_15_0" id_product_attribute="product_attribute_15" id_image=""/>
+    <product_attribute_image id="product_attribute_image_19_0" id_product_attribute="product_attribute_19" id_image=""/>
+    <product_attribute_image id="product_attribute_image_22_0" id_product_attribute="product_attribute_22" id_image=""/>
+    <product_attribute_image id="product_attribute_image_23_0" id_product_attribute="product_attribute_23" id_image=""/>
+    <product_attribute_image id="product_attribute_image_31_37" id_product_attribute="product_attribute_31" id_image="iPod_Nano"/>
+    <product_attribute_image id="product_attribute_image_32_37" id_product_attribute="product_attribute_32" id_image="iPod_Nano"/>
+    <product_attribute_image id="product_attribute_image_25_38" id_product_attribute="product_attribute_25" id_image="iPod_Nano_1"/>
+    <product_attribute_image id="product_attribute_image_26_38" id_product_attribute="product_attribute_26" id_image="iPod_Nano_1"/>
+    <product_attribute_image id="product_attribute_image_39_39" id_product_attribute="product_attribute_39" id_image="iPod_Nano_2"/>
+    <product_attribute_image id="product_attribute_image_40_39" id_product_attribute="product_attribute_40" id_image="iPod_Nano_2"/>
+    <product_attribute_image id="product_attribute_image_33_40" id_product_attribute="product_attribute_33" id_image="iPod_Nano_3"/>
+    <product_attribute_image id="product_attribute_image_34_40" id_product_attribute="product_attribute_34" id_image="iPod_Nano_3"/>
+    <product_attribute_image id="product_attribute_image_35_41" id_product_attribute="product_attribute_35" id_image="iPod_Nano_4"/>
+    <product_attribute_image id="product_attribute_image_36_41" id_product_attribute="product_attribute_36" id_image="iPod_Nano_4"/>
+    <product_attribute_image id="product_attribute_image_41_42" id_product_attribute="product_attribute_41" id_image="iPod_Nano_5"/>
+    <product_attribute_image id="product_attribute_image_42_42" id_product_attribute="product_attribute_42" id_image="iPod_Nano_5"/>
+    <product_attribute_image id="product_attribute_image_29_44" id_product_attribute="product_attribute_29" id_image="iPod_Nano_6"/>
+    <product_attribute_image id="product_attribute_image_30_44" id_product_attribute="product_attribute_30" id_image="iPod_Nano_6"/>
+    <product_attribute_image id="product_attribute_image_27_45" id_product_attribute="product_attribute_27" id_image="iPod_Nano_7"/>
+    <product_attribute_image id="product_attribute_image_28_45" id_product_attribute="product_attribute_28" id_image="iPod_Nano_7"/>
+    <product_attribute_image id="product_attribute_image_7_46" id_product_attribute="product_attribute_7" id_image="iPod_shuffle"/>
+    <product_attribute_image id="product_attribute_image_8_47" id_product_attribute="product_attribute_8" id_image="iPod_shuffle_1"/>
+    <product_attribute_image id="product_attribute_image_10_48" id_product_attribute="product_attribute_10" id_image="iPod_shuffle_2"/>
+    <product_attribute_image id="product_attribute_image_9_49" id_product_attribute="product_attribute_9" id_image="iPod_shuffle_3"/>
+  </entities>
+</entity_product_attribute_image>