From 46bac39fa4158e0c20eaa1ceb7ceb52bfc0f87ef Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 22 Dec 2011 21:16:32 +0000
Subject: [PATCH] // Fix on install

---
 install-new/data/xml/access.xml               |  1 -
 install-new/data/xml/address_format.xml       | 38 +++++-----
 install-new/data/xml/configuration.xml        | 16 +++--
 install-new/data/xml/tab.xml                  |  3 -
 install-new/fixtures/apple/data/access.xml    |  7 +-
 install-new/fixtures/apple/data/customer.xml  |  2 +-
 .../fixtures/apple/data/order_detail.xml      |  4 +-
 .../fixtures/apple/data/stock_available.xml   | 70 ++++++++++---------
 install-new/langs/de/data/tab.xml             |  1 -
 install-new/langs/en/data/tab.xml             |  1 -
 install-new/langs/es/data/tab.xml             |  1 -
 install-new/langs/fr/data/tab.xml             |  1 -
 install-new/langs/it/data/tab.xml             |  1 -
 13 files changed, 72 insertions(+), 74 deletions(-)

diff --git a/install-new/data/xml/access.xml b/install-new/data/xml/access.xml
index b3b33d61e..05fff079c 100644
--- a/install-new/data/xml/access.xml
+++ b/install-new/data/xml/access.xml
@@ -63,7 +63,6 @@
     <access id="access_1_56" id_profile="SuperAdmin" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_57" id_profile="SuperAdmin" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_58" id_profile="SuperAdmin" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_59" id_profile="SuperAdmin" id_tab="Customer_Messages" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_60" id_profile="SuperAdmin" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_61" id_profile="SuperAdmin" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_62" id_profile="SuperAdmin" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
diff --git a/install-new/data/xml/address_format.xml b/install-new/data/xml/address_format.xml
index 466bb5720..cdc8013f6 100644
--- a/install-new/data/xml/address_format.xml
+++ b/install-new/data/xml/address_format.xml
@@ -36,12 +36,12 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_4" id_country="CA">
-      <format>firstname lastname
-company
-address1
-address2
-city State:name postcode
-Country:name
+      <format>firstname lastname&#13;
+company&#13;
+address1&#13;
+address2&#13;
+city State:name postcode&#13;
+Country:name&#13;
 phone</format>
     </address_format>
     <address_format id="address_format_5" id_country="CN">
@@ -95,14 +95,14 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_10" id_country="IT">
-      <format>firstname lastname
-company
-vat_number
-address1
-address2
-postcode city
-State:name
-Country:name
+      <format>firstname lastname&#13;
+company&#13;
+vat_number&#13;
+address1&#13;
+address2&#13;
+postcode city&#13;
+State:name&#13;
+Country:name&#13;
 phone</format>
     </address_format>
     <address_format id="address_format_11" id_country="JP">
@@ -206,11 +206,11 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_21" id_country="US">
-      <format>firstname lastname
-company
-address1 address2
-city, State:name postcode
-Country:name
+      <format>firstname lastname&#13;
+company&#13;
+address1 address2&#13;
+city, State:name postcode&#13;
+Country:name&#13;
 phone</format>
     </address_format>
     <address_format id="address_format_22" id_country="HK">
diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
index c8f02c77e..3509d9367 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 17:39:33</value>
+      <value>2011-12-22 22:11:55</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 17:39:33</value>
+      <value>2011-12-22 22:11:55</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>1324571973</value>
+      <value>1324588315</value>
     </configuration>
     <configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
       <value>1</value>
@@ -500,6 +500,12 @@
     <configuration id="PS_INVOICE_MODEL" name="PS_INVOICE_MODEL">
       <value>invoice</value>
     </configuration>
+    <configuration id="PS_LIMIT_UPLOAD_IMAGE_VALUE" name="PS_LIMIT_UPLOAD_IMAGE_VALUE">
+      <value>2</value>
+    </configuration>
+    <configuration id="PS_LIMIT_UPLOAD_FILE_VALUE" name="PS_LIMIT_UPLOAD_FILE_VALUE">
+      <value>2</value>
+    </configuration>
     <configuration id="MB_PAY_TO_EMAIL" name="MB_PAY_TO_EMAIL">
       <value/>
     </configuration>
@@ -846,7 +852,7 @@
       <value>1.5.0.2</value>
     </configuration>
     <configuration id="PS_SHOP_NAME" name="PS_SHOP_NAME">
-      <value>Test</value>
+      <value>PrestaShop</value>
     </configuration>
     <configuration id="PS_SHOP_EMAIL" name="PS_SHOP_EMAIL">
       <value>raphael.malie@gmail.com</value>
@@ -855,7 +861,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
-      <value>1</value>
+      <value>19</value>
     </configuration>
   </entities>
 </entity_configuration>
diff --git a/install-new/data/xml/tab.xml b/install-new/data/xml/tab.xml
index 6af7018d3..6bc893d4f 100644
--- a/install-new/data/xml/tab.xml
+++ b/install-new/data/xml/tab.xml
@@ -168,9 +168,6 @@
     <tab id="Image_Mapping" id_parent="Catalog" active="1">
       <class_name>AdminScenes</class_name>
     </tab>
-    <tab id="Customer_Messages" id_parent="Orders" active="1">
-      <class_name>AdminMessages</class_name>
-    </tab>
     <tab id="Monitoring" id_parent="Catalog" active="1">
       <class_name>AdminTracking</class_name>
     </tab>
diff --git a/install-new/fixtures/apple/data/access.xml b/install-new/fixtures/apple/data/access.xml
index 60a267861..18e22cd9c 100644
--- a/install-new/fixtures/apple/data/access.xml
+++ b/install-new/fixtures/apple/data/access.xml
@@ -63,7 +63,6 @@
     <access id="access_2_56" id_profile="Administrator" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_57" id_profile="Administrator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_58" id_profile="Administrator" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_59" id_profile="Administrator" id_tab="Customer_Messages" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_60" id_profile="Administrator" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_61" id_profile="Administrator" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_62" id_profile="Administrator" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
@@ -164,7 +163,7 @@
     <access id="access_3_56" id_profile="Logistician" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_57" id_profile="Logistician" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_58" id_profile="Logistician" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_59" id_profile="Logistician" id_tab="Customer_Messages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_59" id_profile="Logistician" id_tab="59" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_60" id_profile="Logistician" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_61" id_profile="Logistician" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_62" id_profile="Logistician" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
@@ -261,7 +260,7 @@
     <access id="access_4_56" id_profile="Translator" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_57" id_profile="Translator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
     <access id="access_4_58" id_profile="Translator" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_59" id_profile="Translator" id_tab="Customer_Messages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_59" id_profile="Translator" id_tab="59" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_60" id_profile="Translator" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_61" id_profile="Translator" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_62" id_profile="Translator" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
@@ -359,7 +358,7 @@
     <access id="access_5_56" id_profile="Salesman" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_57" id_profile="Salesman" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_58" id_profile="Salesman" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_59" id_profile="Salesman" id_tab="Customer_Messages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_59" id_profile="Salesman" id_tab="59" view="1" add="1" edit="1" delete="1"/>
     <access id="access_5_60" id_profile="Salesman" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_61" id_profile="Salesman" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_62" id_profile="Salesman" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
index 0d02e46d5..5311b6f0e 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="028f9b77cb416ceade452c29b258e55d" last_passwd_gen="2011-12-22 17:39:33" 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="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">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>
diff --git a/install-new/fixtures/apple/data/order_detail.xml b/install-new/fixtures/apple/data/order_detail.xml
index 8cf5d6100..f838beeee 100644
--- a/install-new/fixtures/apple/data/order_detail.xml
+++ b/install-new/fixtures/apple/data/order_detail.xml
@@ -43,11 +43,11 @@
     <field name="original_product_price"/>
   </fields>
   <entities>
-    <order_detail id="order_detail_1" id_order="1" id_order_invoice="" id_warehouse="0" product_id="iPod_touch" product_attribute_id="product_attribute_23" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="392.140500" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0" reduction_amount_tax_excl="0" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="469.000000" total_price_tax_excl="392.140000" unit_price_tax_incl="469.000000" unit_price_tax_excl="392.140468" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
+    <order_detail id="order_detail_1" id_order="1" id_order_invoice="" id_warehouse="0" product_id="iPod_touch" product_attribute_id="product_attribute_23" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="392.140500" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0.000000" reduction_amount_tax_excl="0.000000" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="469.000000" total_price_tax_excl="392.140000" unit_price_tax_incl="469.000000" unit_price_tax_excl="392.140468" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
       <product_name>iPod touch - Capacité: 32Go</product_name>
       <download_hash/>
     </order_detail>
-    <order_detail id="order_detail_2" id_order="1" id_order_invoice="" id_warehouse="0" product_id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" product_attribute_id="" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="124.581900" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0" reduction_amount_tax_excl="0" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="149.000000" total_price_tax_excl="124.580000" unit_price_tax_incl="149.000000" unit_price_tax_excl="124.581940" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
+    <order_detail id="order_detail_2" id_order="1" id_order_invoice="" id_warehouse="0" product_id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" product_attribute_id="" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="124.581900" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0.000000" reduction_amount_tax_excl="0.000000" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="149.000000" total_price_tax_excl="124.580000" unit_price_tax_incl="149.000000" unit_price_tax_excl="124.581940" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
       <product_name>Écouteurs à isolation sonore Shure SE210</product_name>
       <download_hash/>
     </order_detail>
diff --git a/install-new/fixtures/apple/data/stock_available.xml b/install-new/fixtures/apple/data/stock_available.xml
index 4aa959cdb..9d64af8b3 100644
--- a/install-new/fixtures/apple/data/stock_available.xml
+++ b/install-new/fixtures/apple/data/stock_available.xml
@@ -3,44 +3,46 @@
   <fields class="StockAvailable">
     <field name="id_product" relation="product"/>
     <field name="id_product_attribute" relation="product_attribute"/>
+    <field name="id_shop"/>
+    <field name="id_group_shop"/>
     <field name="quantity"/>
     <field name="depends_on_stock"/>
     <field name="out_of_stock"/>
   </fields>
   <entities>
-    <stock_available id="stock_available_1" id_product="iPod_Nano" id_product_attribute="product_attribute_25" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_2" id_product="iPod_Nano" id_product_attribute="" quantity="160" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_18" id_product="MacBook_Air" id_product_attribute="product_attribute_12" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_19" id_product="MacBook_Air" id_product_attribute="" quantity="400" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" quantity="25" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_24" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_25" id_product="iPod_shuffle" id_product_attribute="" quantity="120" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_29" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" quantity="15" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_30" id_product="MacBook" id_product_attribute="" quantity="75" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_31" id_product="iPod_touch" id_product_attribute="product_attribute_19" quantity="40" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_32" id_product="iPod_touch" id_product_attribute="" quantity="120" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" quantity="40" depends_on_stock="0" out_of_stock="0"/>
-    <stock_available id="stock_available_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" quantity="40" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_1" id_product="iPod_Nano" id_product_attribute="product_attribute_25" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_2" id_product="iPod_Nano" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="160" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" id_shop="1" id_group_shop="0" quantity="10" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_18" id_product="MacBook_Air" id_product_attribute="product_attribute_12" id_shop="1" id_group_shop="0" quantity="100" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_19" id_product="MacBook_Air" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="400" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" id_shop="1" id_group_shop="0" quantity="100" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" id_shop="1" id_group_shop="0" quantity="100" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" id_shop="1" id_group_shop="0" quantity="100" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="25" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_24" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" id_shop="1" id_group_shop="0" quantity="30" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_25" id_product="iPod_shuffle" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="120" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" id_shop="1" id_group_shop="0" quantity="30" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" id_shop="1" id_group_shop="0" quantity="30" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" id_shop="1" id_group_shop="0" quantity="30" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_29" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="15" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_30" id_product="MacBook" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="75" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_31" id_product="iPod_touch" id_product_attribute="product_attribute_19" id_shop="1" id_group_shop="0" quantity="40" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_32" id_product="iPod_touch" id_product_attribute="" id_shop="1" id_group_shop="0" quantity="120" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" id_shop="1" id_group_shop="0" quantity="40" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" id_shop="1" id_group_shop="0" quantity="40" depends_on_stock="0" out_of_stock="0"/>
   </entities>
 </entity_stock_available>
diff --git a/install-new/langs/de/data/tab.xml b/install-new/langs/de/data/tab.xml
index 0ccf45fd4..645f5b176 100644
--- a/install-new/langs/de/data/tab.xml
+++ b/install-new/langs/de/data/tab.xml
@@ -54,7 +54,6 @@
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
   <tab id="CMS" name="CMS"/>
   <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Customer_Messages" name="Kundennachrichten"/>
   <tab id="Monitoring" name="Tracking"/>
   <tab id="Search_Engines" name="Suchmaschinen"/>
   <tab id="Referrers" name="Referrer"/>
diff --git a/install-new/langs/en/data/tab.xml b/install-new/langs/en/data/tab.xml
index 17436bbcb..1057e2d25 100644
--- a/install-new/langs/en/data/tab.xml
+++ b/install-new/langs/en/data/tab.xml
@@ -54,7 +54,6 @@
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
   <tab id="CMS" name="CMS"/>
   <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Customer_Messages" name="Customer Messages"/>
   <tab id="Monitoring" name="Monitoring"/>
   <tab id="Search_Engines" name="Search Engines"/>
   <tab id="Referrers" name="Referrers"/>
diff --git a/install-new/langs/es/data/tab.xml b/install-new/langs/es/data/tab.xml
index 93c5ada24..9b3828ece 100644
--- a/install-new/langs/es/data/tab.xml
+++ b/install-new/langs/es/data/tab.xml
@@ -54,7 +54,6 @@
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
   <tab id="CMS" name="CMS"/>
   <tab id="Image_Mapping" name="Mapeo de la imagen"/>
-  <tab id="Customer_Messages" name="Mensajes del cliente"/>
   <tab id="Monitoring" name="Rastreo"/>
   <tab id="Search_Engines" name="Motores de b&#xFA;squeda"/>
   <tab id="Referrers" name="Referido"/>
diff --git a/install-new/langs/fr/data/tab.xml b/install-new/langs/fr/data/tab.xml
index d461ab043..1be78fadd 100644
--- a/install-new/langs/fr/data/tab.xml
+++ b/install-new/langs/fr/data/tab.xml
@@ -54,7 +54,6 @@
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
   <tab id="CMS" name="CMS"/>
   <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
-  <tab id="Customer_Messages" name="Messages clients"/>
   <tab id="Monitoring" name="Suivi"/>
   <tab id="Search_Engines" name="Moteurs de recherche"/>
   <tab id="Referrers" name="Sites affluents"/>
diff --git a/install-new/langs/it/data/tab.xml b/install-new/langs/it/data/tab.xml
index a05eee0c3..8eb180be7 100644
--- a/install-new/langs/it/data/tab.xml
+++ b/install-new/langs/it/data/tab.xml
@@ -54,7 +54,6 @@
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
   <tab id="CMS" name="CMS"/>
   <tab id="Image_Mapping" name="Mappatura immagine"/>
-  <tab id="Customer_Messages" name="Messaggi cliente"/>
   <tab id="Monitoring" name="Rintracciare"/>
   <tab id="Search_Engines" name="Motori di ricerca"/>
   <tab id="Referrers" name="Referenti"/>