diff --git a/classes/Delivery.php b/classes/Delivery.php
index 88741e695..f839ba040 100644
--- a/classes/Delivery.php
+++ b/classes/Delivery.php
@@ -85,8 +85,13 @@ class DeliveryCore extends ObjectModel
 		// @todo add null management in definitions
 		if ($this->id_shop)
 			$fields['id_shop'] = (int)$this->id_shop;
+		else
+			$fields['id_shop'] = null;
+
 		if ($this->id_group_shop)
 			$fields['id_group_shop'] = (int)$this->id_group_shop;
+		else
+			$fields['id_group_shop'] = null;
 
 		return $fields;
 	}
diff --git a/install-new/fixtures/apple/data/access.xml b/install-new/fixtures/apple/data/access.xml
index 5d583acba..e7a1fbc4d 100644
--- a/install-new/fixtures/apple/data/access.xml
+++ b/install-new/fixtures/apple/data/access.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_access>
-  <fields primary="id_profile, id_tab" sql="a.id_profile &gt; 1">
-    <field name="id_profile" relation="profile"/>
-    <field name="id_tab" relation="tab"/>
-    <field name="view"/>
-    <field name="add"/>
-    <field name="edit"/>
-    <field name="delete"/>
-  </fields>
   <entities>
     <access id="access_2_1" id_profile="Administrator" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_2" id_profile="Administrator" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
@@ -402,4 +394,12 @@
     <access id="access_5_106" id_profile="Salesman" id_tab="CMS_pages" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_108" id_profile="Salesman" id_tab="Configuration" view="0" add="0" edit="0" delete="0"/>
   </entities>
+  <fields primary="id_profile, id_tab" sql="a.id_profile &gt; 1">
+    <field name="id_profile" relation="profile"/>
+    <field name="id_tab" relation="tab"/>
+    <field name="view"/>
+    <field name="add"/>
+    <field name="edit"/>
+    <field name="delete"/>
+  </fields>
 </entity_access>
diff --git a/install-new/fixtures/apple/data/address.xml b/install-new/fixtures/apple/data/address.xml
index f602105c9..52bfe6687 100644
--- a/install-new/fixtures/apple/data/address.xml
+++ b/install-new/fixtures/apple/data/address.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_address>
+  <entities>
+    <address id="manufacturer" id_country="US" id_state="CA" id_customer="" id_manufacturer="Apple_Computer_Inc" id_supplier="" id_warehouse="0" alias="manufacturer" company="" lastname="JOBS" firstname="STEVE" postcode="95014" phone="(800) 275-2273" phone_mobile="" vat_number="" dni="" active="1">
+      <address1>1 Infinite Loop</address1>
+      <address2/>
+      <city>Cupertino</city>
+      <other/>
+    </address>
+    <address id="Mon_adresse" id_country="FR" id_state="" id_customer="John" id_manufacturer="" id_supplier="" id_warehouse="0" alias="Mon adresse" company="My Company" lastname="DOE" firstname="John" postcode="75000" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
+      <address1>16, Main street</address1>
+      <address2>2nd floor</address2>
+      <city>Paris </city>
+      <other/>
+    </address>
+  </entities>
   <fields id="alias" class="Address">
     <field name="id_country" relation="country"/>
     <field name="id_state" relation="state"/>
@@ -22,18 +36,4 @@
     <field name="dni"/>
     <field name="active"/>
   </fields>
-  <entities>
-    <address id="manufacturer" id_country="US" id_state="CA" id_customer="" id_manufacturer="Apple_Computer_Inc" id_supplier="" id_warehouse="0" alias="manufacturer" company="" lastname="JOBS" firstname="STEVE" postcode="95014" phone="(800) 275-2273" phone_mobile="" vat_number="" dni="" active="1">
-      <address1>1 Infinite Loop</address1>
-      <address2/>
-      <city>Cupertino</city>
-      <other/>
-    </address>
-    <address id="Mon_adresse" id_country="FR" id_state="" id_customer="John" id_manufacturer="" id_supplier="" id_warehouse="0" alias="Mon adresse" company="My Company" lastname="DOE" firstname="John" postcode="75000" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
-      <address1>16, Main street</address1>
-      <address2>2nd floor</address2>
-      <city>Paris </city>
-      <other/>
-    </address>
-  </entities>
 </entity_address>
diff --git a/install-new/fixtures/apple/data/alias.xml b/install-new/fixtures/apple/data/alias.xml
index c734f41c0..c4f4e06bf 100644
--- a/install-new/fixtures/apple/data/alias.xml
+++ b/install-new/fixtures/apple/data/alias.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_alias>
-  <fields id="alias" class="Alias">
-    <field name="alias"/>
-    <field name="search"/>
-    <field name="active"/>
-  </fields>
   <entities>
     <alias id="ipdo" active="1">
       <alias>ipdo</alias>
@@ -15,4 +10,9 @@
       <search>ipod</search>
     </alias>
   </entities>
+  <fields id="alias" class="Alias">
+    <field name="alias"/>
+    <field name="search"/>
+    <field name="active"/>
+  </fields>
 </entity_alias>
diff --git a/install-new/fixtures/apple/data/attribute.xml b/install-new/fixtures/apple/data/attribute.xml
index 57f1343ba..2793e95c8 100644
--- a/install-new/fixtures/apple/data/attribute.xml
+++ b/install-new/fixtures/apple/data/attribute.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_attribute>
-  <fields id="name" class="Attribute">
-    <field name="id_attribute_group" relation="attribute_group"/>
-    <field name="color"/>
-  </fields>
   <entities>
     <attribute id="2GB" id_attribute_group="Disk_space" color=""/>
     <attribute id="4GB" id_attribute_group="Disk_space" color=""/>
@@ -26,4 +22,8 @@
     <attribute id="Yellow" id_attribute_group="Color" color="#F6EF04"/>
     <attribute id="Red" id_attribute_group="Color" color="#F60409"/>
   </entities>
+  <fields id="name" class="Attribute">
+    <field name="id_attribute_group" relation="attribute_group"/>
+    <field name="color"/>
+  </fields>
 </entity_attribute>
diff --git a/install-new/fixtures/apple/data/attribute_group.xml b/install-new/fixtures/apple/data/attribute_group.xml
index 04c30c826..001170244 100644
--- a/install-new/fixtures/apple/data/attribute_group.xml
+++ b/install-new/fixtures/apple/data/attribute_group.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_attribute_group>
-  <fields id="name" class="AttributeGroup">
-    <field name="is_color_group"/>
-    <field name="group_type"/>
-  </fields>
   <entities>
     <attribute_group id="Disk_space" is_color_group="0" group_type="select"/>
     <attribute_group id="Color" is_color_group="1" group_type="color"/>
     <attribute_group id="ICU" is_color_group="0" group_type="select"/>
   </entities>
+  <fields id="name" class="AttributeGroup">
+    <field name="is_color_group"/>
+    <field name="group_type"/>
+  </fields>
 </entity_attribute_group>
diff --git a/install-new/fixtures/apple/data/carrier.xml b/install-new/fixtures/apple/data/carrier.xml
index 52b6b3b6f..df9c3da9d 100644
--- a/install-new/fixtures/apple/data/carrier.xml
+++ b/install-new/fixtures/apple/data/carrier.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier>
+  <entities>
+    <carrier id="My_carrier" id_reference="2" id_tax_rules_group="1" active="1" shipping_handling="1" range_behavior="0" is_free="0" shipping_external="0" need_range="0" shipping_method="0" max_width="0" max_height="0" max_depth="0" max_weight="0" grade="0">
+      <name>My carrier</name>
+      <url/>
+    </carrier>
+  </entities>
   <fields id="name" class="Carrier" sql="a.id_carrier &gt; 1">
     <field name="id_reference"/>
     <field name="id_tax_rules_group"/>
@@ -18,10 +24,4 @@
     <field name="max_weight"/>
     <field name="grade"/>
   </fields>
-  <entities>
-    <carrier id="My_carrier" id_reference="2" id_tax_rules_group="1" active="1" shipping_handling="1" range_behavior="0" is_free="0" shipping_external="0" need_range="0" shipping_method="0" max_width="0" max_height="0" max_depth="0" max_weight="0" grade="0">
-      <name>My carrier</name>
-      <url/>
-    </carrier>
-  </entities>
 </entity_carrier>
diff --git a/install-new/fixtures/apple/data/carrier_group.xml b/install-new/fixtures/apple/data/carrier_group.xml
index f663f440f..e711c8eae 100644
--- a/install-new/fixtures/apple/data/carrier_group.xml
+++ b/install-new/fixtures/apple/data/carrier_group.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier_group>
-  <fields primary="id_carrier, id_group" sql="a.id_carrier &gt; 1">
-    <field name="id_carrier" relation="carrier"/>
-    <field name="id_group" relation="group"/>
-  </fields>
   <entities>
     <carrier_group id="carrier_group_2_1" id_carrier="My_carrier" id_group="Unidentified"/>
     <carrier_group id="carrier_group_2_2" id_carrier="My_carrier" id_group="Guest"/>
     <carrier_group id="carrier_group_2_3" id_carrier="My_carrier" id_group="Default"/>
   </entities>
+  <fields primary="id_carrier, id_group" sql="a.id_carrier &gt; 1">
+    <field name="id_carrier" relation="carrier"/>
+    <field name="id_group" relation="group"/>
+  </fields>
 </entity_carrier_group>
diff --git a/install-new/fixtures/apple/data/carrier_zone.xml b/install-new/fixtures/apple/data/carrier_zone.xml
index 59390cfd6..694f53933 100644
--- a/install-new/fixtures/apple/data/carrier_zone.xml
+++ b/install-new/fixtures/apple/data/carrier_zone.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier_zone>
-  <fields primary="id_carrier, id_zone" sql="a.id_carrier &gt; 1">
-    <field name="id_carrier" relation="carrier"/>
-    <field name="id_zone" relation="zone"/>
-  </fields>
   <entities>
     <carrier_zone id="carrier_zone_2_1" id_carrier="My_carrier" id_zone="Europe"/>
     <carrier_zone id="carrier_zone_2_2" id_carrier="My_carrier" id_zone="North_America"/>
   </entities>
+  <fields primary="id_carrier, id_zone" sql="a.id_carrier &gt; 1">
+    <field name="id_carrier" relation="carrier"/>
+    <field name="id_zone" relation="zone"/>
+  </fields>
 </entity_carrier_zone>
diff --git a/install-new/fixtures/apple/data/cart.xml b/install-new/fixtures/apple/data/cart.xml
index 6d299fa5a..e691c2d27 100644
--- a/install-new/fixtures/apple/data/cart.xml
+++ b/install-new/fixtures/apple/data/cart.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_cart>
+  <entities>
+    <cart id="cart_1" id_carrier="My_carrier" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" id_currency="1" id_customer="John" id_guest="guest_1" secure_key="-1" recyclable="1" gift="0" allow_seperated_package="0">
+      <delivery_option/>
+      <gift_message/>
+    </cart>
+  </entities>
   <fields class="Cart">
     <field name="id_carrier" relation="carrier"/>
     <field name="delivery_option"/>
@@ -14,10 +20,4 @@
     <field name="gift_message"/>
     <field name="allow_seperated_package"/>
   </fields>
-  <entities>
-    <cart id="cart_1" id_carrier="My_carrier" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" id_currency="1" id_customer="John" id_guest="guest_1" secure_key="-1" recyclable="1" gift="0" allow_seperated_package="0">
-      <delivery_option/>
-      <gift_message/>
-    </cart>
-  </entities>
 </entity_cart>
diff --git a/install-new/fixtures/apple/data/cart_product.xml b/install-new/fixtures/apple/data/cart_product.xml
index 2dc8e62e5..8dfd20d88 100644
--- a/install-new/fixtures/apple/data/cart_product.xml
+++ b/install-new/fixtures/apple/data/cart_product.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_cart_product>
+  <entities>
+    <cart_product id="cart_product_1_7_23" id_cart="cart_1" id_product="iPod_touch" id_address_delivery="0" id_product_attribute="product_attribute_23" quantity="1"/>
+    <cart_product id="cart_product_1_9_0" id_cart="cart_1" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_address_delivery="0" id_product_attribute="" quantity="1"/>
+  </entities>
   <fields primary="id_cart, id_product, id_product_attribute">
     <field name="id_cart" relation="cart"/>
     <field name="id_product" relation="product"/>
@@ -7,8 +11,4 @@
     <field name="id_product_attribute" relation="product_attribute"/>
     <field name="quantity"/>
   </fields>
-  <entities>
-    <cart_product id="cart_product_1_7_23" id_cart="cart_1" id_product="iPod_touch" id_address_delivery="0" id_product_attribute="product_attribute_23" quantity="1"/>
-    <cart_product id="cart_product_1_9_0" id_cart="cart_1" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_address_delivery="0" id_product_attribute="" quantity="1"/>
-  </entities>
 </entity_cart_product>
diff --git a/install-new/fixtures/apple/data/category.xml b/install-new/fixtures/apple/data/category.xml
index 2eb06c28c..a7cebb686 100644
--- a/install-new/fixtures/apple/data/category.xml
+++ b/install-new/fixtures/apple/data/category.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-  <fields id="name" class="Category" sql="a.id_category &gt; 1" image="c">
-    <field name="id_parent" relation="category"/>
-    <field name="active"/>
-  </fields>
   <entities>
     <category id="iPods" id_parent="Home" active="1"/>
     <category id="Accessories" id_parent="Home" active="1"/>
     <category id="Laptops" id_parent="Home" active="1"/>
   </entities>
+  <fields id="name" class="Category" sql="a.id_category &gt; 1" image="c">
+    <field name="id_parent" relation="category"/>
+    <field name="active"/>
+  </fields>
 </entity_category>
diff --git a/install-new/fixtures/apple/data/category_group.xml b/install-new/fixtures/apple/data/category_group.xml
index c92e4246d..90fc59d44 100644
--- a/install-new/fixtures/apple/data/category_group.xml
+++ b/install-new/fixtures/apple/data/category_group.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0"?>
 <entity_category_group>
-  <fields primary="id_category, id_group" sql="a.id_category &gt; 1">
-    <field name="id_category" relation="category"/>
-    <field name="id_group" relation="group"/>
-  </fields>
   <entities>
     <category_group id="category_group_2_1" id_category="iPods" id_group="Unidentified"/>
     <category_group id="category_group_2_2" id_category="iPods" id_group="Guest"/>
@@ -15,4 +11,8 @@
     <category_group id="category_group_4_2" id_category="Laptops" id_group="Guest"/>
     <category_group id="category_group_4_3" id_category="Laptops" id_group="Default"/>
   </entities>
+  <fields primary="id_category, id_group" sql="a.id_category &gt; 1">
+    <field name="id_category" relation="category"/>
+    <field name="id_group" relation="group"/>
+  </fields>
 </entity_category_group>
diff --git a/install-new/fixtures/apple/data/category_product.xml b/install-new/fixtures/apple/data/category_product.xml
index 61fa8c812..07554841e 100644
--- a/install-new/fixtures/apple/data/category_product.xml
+++ b/install-new/fixtures/apple/data/category_product.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category_product>
-  <fields primary="id_category, id_product">
-    <field name="id_category" relation="category"/>
-    <field name="id_product" relation="product"/>
-  </fields>
   <entities>
     <category_product id="category_product_1_1" id_category="Home" id_product="iPod_Nano"/>
     <category_product id="category_product_1_2" id_category="Home" id_product="iPod_shuffle"/>
@@ -17,4 +13,8 @@
     <category_product id="category_product_4_5" id_category="Laptops" id_product="MacBook_Air"/>
     <category_product id="category_product_4_6" id_category="Laptops" id_product="MacBook"/>
   </entities>
+  <fields primary="id_category, id_product">
+    <field name="id_category" relation="category"/>
+    <field name="id_product" relation="product"/>
+  </fields>
 </entity_category_product>
diff --git a/install-new/fixtures/apple/data/connections.xml b/install-new/fixtures/apple/data/connections.xml
index 2395fcce7..13f69255b 100644
--- a/install-new/fixtures/apple/data/connections.xml
+++ b/install-new/fixtures/apple/data/connections.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_connections>
+  <entities>
+    <connections id="connections_1" id_guest="guest_1" id_page="1" ip_address="2130706433">
+      <http_referer>http://www.prestashop.com</http_referer>
+    </connections>
+  </entities>
   <fields class="Connection">
     <field name="id_guest" relation="guest"/>
     <field name="id_page"/>
     <field name="ip_address"/>
     <field name="http_referer"/>
   </fields>
-  <entities>
-    <connections id="connections_1" id_guest="guest_1" id_page="1" ip_address="2130706433">
-      <http_referer>http://www.prestashop.com</http_referer>
-    </connections>
-  </entities>
 </entity_connections>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
index 2f064dcac..5e4c2aaea 100644
--- a/install-new/fixtures/apple/data/customer.xml
+++ b/install-new/fixtures/apple/data/customer.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_customer>
+  <entities>
+    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="3b804a99e990bdc8d8788f72a1ff355b" last_passwd_gen="2011-12-22 23:47:41" 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>
+  </entities>
   <fields id="firstname" class="Customer">
     <field name="id_gender" relation="gender"/>
     <field name="id_default_group"/>
@@ -18,10 +24,4 @@
     <field name="active"/>
     <field name="is_guest"/>
   </fields>
-  <entities>
-    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="3b804a99e990bdc8d8788f72a1ff355b" last_passwd_gen="2011-12-22 23:47:41" 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>
-  </entities>
 </entity_customer>
diff --git a/install-new/fixtures/apple/data/delivery.xml b/install-new/fixtures/apple/data/delivery.xml
index 4c24e2ef3..045f5d80e 100644
--- a/install-new/fixtures/apple/data/delivery.xml
+++ b/install-new/fixtures/apple/data/delivery.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_delivery>
-  <fields class="Delivery" sql="a.id_carrier &gt; 1">
+  <entities>
+    <delivery id="delivery_1" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="Europe" price="5.000000"/>
+    <delivery id="delivery_2" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="North_America" price="5.000000"/>
+    <delivery id="delivery_4" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="Europe" price="5.000000"/>
+    <delivery id="delivery_5" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="North_America" price="5.000000"/>
+  </entities>
+  <fields class="Delivery" sql="a.id_carrier &gt; 1" null="1">
     <field name="id_shop"/>
     <field name="id_group_shop"/>
     <field name="id_carrier" relation="carrier"/>
@@ -9,10 +15,4 @@
     <field name="id_zone" relation="zone"/>
     <field name="price"/>
   </fields>
-  <entities>
-    <delivery id="delivery_1" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="Europe" price="5.000000"/>
-    <delivery id="delivery_2" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="North_America" price="5.000000"/>
-    <delivery id="delivery_4" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="Europe" price="5.000000"/>
-    <delivery id="delivery_5" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="North_America" price="5.000000"/>
-  </entities>
 </entity_delivery>
diff --git a/install-new/fixtures/apple/data/feature.xml b/install-new/fixtures/apple/data/feature.xml
index 863bdfd89..966674780 100644
--- a/install-new/fixtures/apple/data/feature.xml
+++ b/install-new/fixtures/apple/data/feature.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_feature>
-  <fields id="name" class="Feature"/>
   <entities>
     <feature id="Height"/>
     <feature id="Width"/>
@@ -8,4 +7,5 @@
     <feature id="Weight"/>
     <feature id="Headphone"/>
   </entities>
+  <fields id="name" class="Feature"/>
 </entity_feature>
diff --git a/install-new/fixtures/apple/data/feature_value.xml b/install-new/fixtures/apple/data/feature_value.xml
index 55b50f4f5..5c7987977 100644
--- a/install-new/fixtures/apple/data/feature_value.xml
+++ b/install-new/fixtures/apple/data/feature_value.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_feature_value>
-  <fields id="value" class="FeatureValue">
-    <field name="id_feature" relation="feature"/>
-    <field name="custom"/>
-  </fields>
   <entities>
     <feature_value id="Jack_stereo" id_feature="Headphone" custom="0"/>
     <feature_value id="Mini-jack_stereo" id_feature="Headphone" custom="0"/>
@@ -20,4 +16,8 @@
     <feature_value id="120g" id_feature="Weight" custom="1"/>
     <feature_value id="0_31_in" id_feature="Depth" custom="1"/>
   </entities>
+  <fields id="value" class="FeatureValue">
+    <field name="id_feature" relation="feature"/>
+    <field name="custom"/>
+  </fields>
 </entity_feature_value>
diff --git a/install-new/fixtures/apple/data/guest.xml b/install-new/fixtures/apple/data/guest.xml
index 8477fcd55..243c1922a 100644
--- a/install-new/fixtures/apple/data/guest.xml
+++ b/install-new/fixtures/apple/data/guest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_guest>
+  <entities>
+    <guest id="guest_1" id_operating_system="Windows_XP" id_web_browser="Firefox_3_x" id_customer="John" javascript="1" screen_resolution_x="1680" screen_resolution_y="1050" screen_color="32" sun_java="1" adobe_flash="1" adobe_director="0" apple_quicktime="1" real_player="1" windows_media="0" accept_language="en-us"/>
+  </entities>
   <fields class="Guest">
     <field name="id_operating_system" relation="operating_system"/>
     <field name="id_web_browser" relation="web_browser"/>
@@ -16,7 +19,4 @@
     <field name="windows_media"/>
     <field name="accept_language"/>
   </fields>
-  <entities>
-    <guest id="guest_1" id_operating_system="Windows_XP" id_web_browser="Firefox_3_x" id_customer="John" javascript="1" screen_resolution_x="1680" screen_resolution_y="1050" screen_color="32" sun_java="1" adobe_flash="1" adobe_director="0" apple_quicktime="1" real_player="1" windows_media="0" accept_language="en-us"/>
-  </entities>
 </entity_guest>
diff --git a/install-new/fixtures/apple/data/image.xml b/install-new/fixtures/apple/data/image.xml
index f96ae20ae..7a2c16603 100644
--- a/install-new/fixtures/apple/data/image.xml
+++ b/install-new/fixtures/apple/data/image.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_image>
-  <fields id="legend" class="Image" image="p">
-    <field name="id_product" relation="product"/>
-    <field name="cover"/>
-  </fields>
   <entities>
     <image id="MacBook_Air" id_product="MacBook_Air" cover="1"/>
     <image id="MacBook_Air_1" id_product="MacBook_Air" cover="0"/>
@@ -32,4 +28,8 @@
     <image id="iPod_shuffle_2" id_product="iPod_shuffle" cover="0"/>
     <image id="iPod_shuffle_3" id_product="iPod_shuffle" cover="0"/>
   </entities>
+  <fields id="legend" class="Image" image="p">
+    <field name="id_product" relation="product"/>
+    <field name="cover"/>
+  </fields>
 </entity_image>
diff --git a/install-new/fixtures/apple/data/manufacturer.xml b/install-new/fixtures/apple/data/manufacturer.xml
index 984429e56..b861aa71d 100644
--- a/install-new/fixtures/apple/data/manufacturer.xml
+++ b/install-new/fixtures/apple/data/manufacturer.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_manufacturer>
-  <fields id="name" class="Manufacturer" image="m">
-    <field name="name"/>
-    <field name="active"/>
-  </fields>
   <entities>
     <manufacturer id="Apple_Computer_Inc" active="1">
       <name>Apple Computer, Inc</name>
@@ -12,4 +8,8 @@
       <name>Shure Incorporated</name>
     </manufacturer>
   </entities>
+  <fields id="name" class="Manufacturer" image="m">
+    <field name="name"/>
+    <field name="active"/>
+  </fields>
 </entity_manufacturer>
diff --git a/install-new/fixtures/apple/data/order_detail.xml b/install-new/fixtures/apple/data/order_detail.xml
index f838beeee..cec85cad4 100644
--- a/install-new/fixtures/apple/data/order_detail.xml
+++ b/install-new/fixtures/apple/data/order_detail.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_detail>
+  <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.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.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>
+  </entities>
   <fields class="OrderDetail">
     <field name="id_order" relation="orders"/>
     <field name="id_order_invoice"/>
@@ -42,14 +52,4 @@
     <field name="purchase_supplier_price"/>
     <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.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.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>
-  </entities>
 </entity_order_detail>
diff --git a/install-new/fixtures/apple/data/order_history.xml b/install-new/fixtures/apple/data/order_history.xml
index 22d8c6ca8..95d994315 100644
--- a/install-new/fixtures/apple/data/order_history.xml
+++ b/install-new/fixtures/apple/data/order_history.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_history>
+  <entities>
+    <order_history id="order_history_1" id_employee="0" id_order="1" id_order_state="Awaiting_cheque_payment"/>
+  </entities>
   <fields class="OrderHistory">
     <field name="id_employee"/>
     <field name="id_order" relation="orders"/>
     <field name="id_order_state" relation="order_state"/>
   </fields>
-  <entities>
-    <order_history id="order_history_1" id_employee="0" id_order="1" id_order_state="Awaiting_cheque_payment"/>
-  </entities>
 </entity_order_history>
diff --git a/install-new/fixtures/apple/data/order_message.xml b/install-new/fixtures/apple/data/order_message.xml
index 1c9a0e3e2..ff2864da8 100644
--- a/install-new/fixtures/apple/data/order_message.xml
+++ b/install-new/fixtures/apple/data/order_message.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_message>
-  <fields id="name" class="OrderMessage"/>
   <entities>
     <order_message id="Delay"/>
   </entities>
+  <fields id="name" class="OrderMessage"/>
 </entity_order_message>
diff --git a/install-new/fixtures/apple/data/orders.xml b/install-new/fixtures/apple/data/orders.xml
index 8334205d1..aa857fe32 100644
--- a/install-new/fixtures/apple/data/orders.xml
+++ b/install-new/fixtures/apple/data/orders.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_orders>
+  <entities>
+    <orders id="orders_1" reference="XKBKNABJ" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
+      <payment>Chèque</payment>
+      <module>cheque</module>
+      <gift_message/>
+    </orders>
+  </entities>
   <fields primary="id_order" class="Order">
     <field name="reference"/>
     <field name="id_carrier" relation="carrier"/>
@@ -37,11 +44,4 @@
     <field name="delivery_date"/>
     <field name="valid"/>
   </fields>
-  <entities>
-    <orders id="orders_1" reference="XKBKNABJ" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
-      <payment>Chèque</payment>
-      <module>cheque</module>
-      <gift_message/>
-    </orders>
-  </entities>
 </entity_orders>
diff --git a/install-new/fixtures/apple/data/product.xml b/install-new/fixtures/apple/data/product.xml
index 34537f6cf..1a48a1ef1 100644
--- a/install-new/fixtures/apple/data/product.xml
+++ b/install-new/fixtures/apple/data/product.xml
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_product>
+  <entities>
+    <product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="iPod_touch" id_supplier="" id_manufacturer="" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_tax_rules_group="1" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+    <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_tax_rules_group="1" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
+      <unity/>
+      <location/>
+    </product>
+  </entities>
   <fields id="name" class="Product">
     <field name="id_supplier" relation="supplier"/>
     <field name="id_manufacturer" relation="manufacturer"/>
@@ -41,34 +71,4 @@
     <field name="cache_default_attribute"/>
     <field name="advanced_stock_management"/>
   </fields>
-  <entities>
-    <product id="iPod_Nano" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="70.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.5" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="iPod_shuffle" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="66.053500" wholesale_price="33.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="MacBook_Air" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1504.180602" wholesale_price="1000.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="1.36" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="MacBook" id_supplier="AppleStore" id_manufacturer="Apple_Computer_Inc" id_tax_rules_group="1" id_category_default="Laptops" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="1170.568561" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0.75" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="iPod_touch" id_supplier="" id_manufacturer="" id_tax_rules_group="1" id_category_default="iPods" on_sale="0" online_only="0" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="241.638796" wholesale_price="200.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_supplier="" id_manufacturer="" id_tax_rules_group="1" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="25.041806" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-    <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_supplier="Shure_Online_Store" id_manufacturer="Shure_Incorporated" id_tax_rules_group="1" id_category_default="Accessories" on_sale="0" online_only="1" ean13="0" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" price="124.581940" wholesale_price="0.000000" unit_price_ratio="0.000000" additional_shipping_cost="0.00" reference="" supplier_reference="" width="0" height="0" depth="0" weight="0" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="" advanced_stock_management="0">
-      <unity/>
-      <location/>
-    </product>
-  </entities>
 </entity_product>
diff --git a/install-new/fixtures/apple/data/product_attribute.xml b/install-new/fixtures/apple/data/product_attribute.xml
index 4d6c14415..fb260f2e9 100644
--- a/install-new/fixtures/apple/data/product_attribute.xml
+++ b/install-new/fixtures/apple/data/product_attribute.xml
@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_product_attribute>
-  <fields>
-    <field name="id_product" relation="product"/>
-    <field name="reference"/>
-    <field name="supplier_reference"/>
-    <field name="location"/>
-    <field name="ean13"/>
-    <field name="upc"/>
-    <field name="wholesale_price"/>
-    <field name="price"/>
-    <field name="ecotax"/>
-    <field name="quantity"/>
-    <field name="weight"/>
-    <field name="unit_price_impact"/>
-    <field name="default_on"/>
-    <field name="minimal_quantity"/>
-    <field name="available_date"/>
-  </fields>
   <entities>
     <product_attribute id="product_attribute_7" id_product="iPod_shuffle" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="10" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
       <location/>
@@ -100,4 +83,21 @@
       <location/>
     </product_attribute>
   </entities>
+  <fields>
+    <field name="id_product" relation="product"/>
+    <field name="reference"/>
+    <field name="supplier_reference"/>
+    <field name="location"/>
+    <field name="ean13"/>
+    <field name="upc"/>
+    <field name="wholesale_price"/>
+    <field name="price"/>
+    <field name="ecotax"/>
+    <field name="quantity"/>
+    <field name="weight"/>
+    <field name="unit_price_impact"/>
+    <field name="default_on"/>
+    <field name="minimal_quantity"/>
+    <field name="available_date"/>
+  </fields>
 </entity_product_attribute>
diff --git a/install-new/fixtures/apple/data/product_attribute_combination.xml b/install-new/fixtures/apple/data/product_attribute_combination.xml
index 0c461960d..979a3c0b8 100644
--- a/install-new/fixtures/apple/data/product_attribute_combination.xml
+++ b/install-new/fixtures/apple/data/product_attribute_combination.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_product_attribute_combination>
-  <fields primary="id_attribute, id_product_attribute">
-    <field name="id_attribute" relation="attribute"/>
-    <field name="id_product_attribute" relation="product_attribute"/>
-  </fields>
   <entities>
     <product_attribute_combination id="product_attribute_combination_4_7" id_attribute="Blue" id_product_attribute="product_attribute_7"/>
     <product_attribute_combination id="product_attribute_combination_6_8" id_attribute="Green" id_product_attribute="product_attribute_8"/>
@@ -57,4 +53,8 @@
     <product_attribute_combination id="product_attribute_combination_15_42" id_attribute="8Go" id_product_attribute="product_attribute_42"/>
     <product_attribute_combination id="product_attribute_combination_18_42" id_attribute="Purple" id_product_attribute="product_attribute_42"/>
   </entities>
+  <fields primary="id_attribute, id_product_attribute">
+    <field name="id_attribute" relation="attribute"/>
+    <field name="id_product_attribute" relation="product_attribute"/>
+  </fields>
 </entity_product_attribute_combination>
diff --git a/install-new/fixtures/apple/data/product_attribute_image.xml b/install-new/fixtures/apple/data/product_attribute_image.xml
index 0d235050a..8aafddde7 100644
--- a/install-new/fixtures/apple/data/product_attribute_image.xml
+++ b/install-new/fixtures/apple/data/product_attribute_image.xml
@@ -1,9 +1,5 @@
 <?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=""/>
@@ -33,4 +29,8 @@
     <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>
+  <fields primary="id_product_attribute, id_image">
+    <field name="id_product_attribute" relation="product_attribute"/>
+    <field name="id_image" relation="image"/>
+  </fields>
 </entity_product_attribute_image>
diff --git a/install-new/fixtures/apple/data/product_supplier.xml b/install-new/fixtures/apple/data/product_supplier.xml
index 59c4ce5ab..37fc91287 100644
--- a/install-new/fixtures/apple/data/product_supplier.xml
+++ b/install-new/fixtures/apple/data/product_supplier.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0"?>
 <entity_product_supplier>
-  <fields class="ProductSupplier">
-    <field name="id_product" relation="product"/>
-    <field name="id_product_attribute" relation="product_attribute"/>
-    <field name="id_supplier" relation="supplier"/>
-    <field name="product_supplier_reference"/>
-    <field name="product_supplier_price_te"/>
-  </fields>
   <entities>
     <product_supplier id="product_supplier_1" id_product="iPod_Nano" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
     <product_supplier id="product_supplier_2" id_product="iPod_Nano" id_product_attribute="product_attribute_25" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
@@ -43,4 +36,11 @@
     <product_supplier id="product_supplier_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
     <product_supplier id="product_supplier_35" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" id_supplier="Shure_Online_Store" product_supplier_reference="" product_supplier_price_te="0.000000"/>
   </entities>
+  <fields class="ProductSupplier">
+    <field name="id_product" relation="product"/>
+    <field name="id_product_attribute" relation="product_attribute"/>
+    <field name="id_supplier" relation="supplier"/>
+    <field name="product_supplier_reference"/>
+    <field name="product_supplier_price_te"/>
+  </fields>
 </entity_product_supplier>
diff --git a/install-new/fixtures/apple/data/profile.xml b/install-new/fixtures/apple/data/profile.xml
index e936c897e..706ba7fce 100644
--- a/install-new/fixtures/apple/data/profile.xml
+++ b/install-new/fixtures/apple/data/profile.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_profile>
-  <fields id="name" class="Profile" sql="a.id_profile &gt; 1"/>
   <entities>
     <profile id="Administrator"/>
     <profile id="Logistician"/>
     <profile id="Translator"/>
     <profile id="Salesman"/>
   </entities>
+  <fields id="name" class="Profile" sql="a.id_profile &gt; 1"/>
 </entity_profile>
diff --git a/install-new/fixtures/apple/data/range_price.xml b/install-new/fixtures/apple/data/range_price.xml
index ce420575e..a52ce5aac 100644
--- a/install-new/fixtures/apple/data/range_price.xml
+++ b/install-new/fixtures/apple/data/range_price.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_range_price>
+  <entities>
+    <range_price id="range_price_1" id_carrier="My_carrier" delimiter1="0.000000" delimiter2="10000.000000"/>
+  </entities>
   <fields class="RangePrice">
     <field name="id_carrier" relation="carrier"/>
     <field name="delimiter1"/>
     <field name="delimiter2"/>
   </fields>
-  <entities>
-    <range_price id="range_price_1" id_carrier="My_carrier" delimiter1="0.000000" delimiter2="10000.000000"/>
-  </entities>
 </entity_range_price>
diff --git a/install-new/fixtures/apple/data/range_weight.xml b/install-new/fixtures/apple/data/range_weight.xml
index ce95fa9f5..ab2b430d5 100644
--- a/install-new/fixtures/apple/data/range_weight.xml
+++ b/install-new/fixtures/apple/data/range_weight.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_range_weight>
+  <entities>
+    <range_weight id="range_weight_1" id_carrier="My_carrier" delimiter1="0.000000" delimiter2="10000.000000"/>
+  </entities>
   <fields class="RangeWeight">
     <field name="id_carrier" relation="carrier"/>
     <field name="delimiter1"/>
     <field name="delimiter2"/>
   </fields>
-  <entities>
-    <range_weight id="range_weight_1" id_carrier="My_carrier" delimiter1="0.000000" delimiter2="10000.000000"/>
-  </entities>
 </entity_range_weight>
diff --git a/install-new/fixtures/apple/data/scene.xml b/install-new/fixtures/apple/data/scene.xml
index c519b20a7..fd41f2155 100644
--- a/install-new/fixtures/apple/data/scene.xml
+++ b/install-new/fixtures/apple/data/scene.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_scene>
-  <fields id="name" class="Scene" image="scenes, scenes/thumbs">
-    <field name="active"/>
-  </fields>
   <entities>
     <scene id="The_iPods_Nano" active="1"/>
     <scene id="The_iPods" active="1"/>
     <scene id="The_MacBooks" active="1"/>
   </entities>
+  <fields id="name" class="Scene" image="scenes, scenes/thumbs">
+    <field name="active"/>
+  </fields>
 </entity_scene>
diff --git a/install-new/fixtures/apple/data/specific_price.xml b/install-new/fixtures/apple/data/specific_price.xml
index 3d0699022..28a43830c 100644
--- a/install-new/fixtures/apple/data/specific_price.xml
+++ b/install-new/fixtures/apple/data/specific_price.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <entity_specific_price>
+  <entities>
+    <specific_price id="specific_price_1" id_cart="" id_product="iPod_Nano" id_shop="0" id_group_shop="0" id_currency="0" id_country="" id_group="" id_customer="" id_product_attribute="" price="0.000000" from_quantity="1" reduction="0.050000" reduction_type="percentage" from="0000-00-00 00:00:00" to="0000-00-00 00:00:00"/>
+  </entities>
   <fields class="SpecificPrice">
     <field name="id_cart" relation="cart"/>
     <field name="id_product" relation="product"/>
@@ -17,7 +20,4 @@
     <field name="from"/>
     <field name="to"/>
   </fields>
-  <entities>
-    <specific_price id="specific_price_1" id_cart="" id_product="iPod_Nano" id_shop="0" id_group_shop="0" id_currency="0" id_country="" id_group="" id_customer="" id_product_attribute="" price="0.000000" from_quantity="1" reduction="0.050000" reduction_type="percentage" from="0000-00-00 00:00:00" to="0000-00-00 00:00:00"/>
-  </entities>
 </entity_specific_price>
diff --git a/install-new/fixtures/apple/data/stock_available.xml b/install-new/fixtures/apple/data/stock_available.xml
index 9d64af8b3..7d2cb6880 100644
--- a/install-new/fixtures/apple/data/stock_available.xml
+++ b/install-new/fixtures/apple/data/stock_available.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_stock_available>
-  <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" 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"/>
@@ -45,4 +36,13 @@
     <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>
+  <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>
 </entity_stock_available>
diff --git a/install-new/fixtures/apple/data/store.xml b/install-new/fixtures/apple/data/store.xml
index f4ec91959..ec698d79a 100644
--- a/install-new/fixtures/apple/data/store.xml
+++ b/install-new/fixtures/apple/data/store.xml
@@ -1,22 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_store>
-  <fields id="name" class="Store" image="st">
-    <field name="id_country" relation="country"/>
-    <field name="id_state" relation="state"/>
-    <field name="name"/>
-    <field name="address1"/>
-    <field name="address2"/>
-    <field name="city"/>
-    <field name="postcode"/>
-    <field name="latitude"/>
-    <field name="longitude"/>
-    <field name="hours"/>
-    <field name="phone"/>
-    <field name="fax"/>
-    <field name="email"/>
-    <field name="note"/>
-    <field name="active"/>
-  </fields>
   <entities>
     <store id="Dade_County" id_country="US" id_state="FL" postcode=" 33135" latitude="25.76500500" longitude="-80.24379700" phone="" fax="" active="1">
       <name>Dade County</name>
@@ -64,4 +47,21 @@
       <note/>
     </store>
   </entities>
+  <fields id="name" class="Store" image="st">
+    <field name="id_country" relation="country"/>
+    <field name="id_state" relation="state"/>
+    <field name="name"/>
+    <field name="address1"/>
+    <field name="address2"/>
+    <field name="city"/>
+    <field name="postcode"/>
+    <field name="latitude"/>
+    <field name="longitude"/>
+    <field name="hours"/>
+    <field name="phone"/>
+    <field name="fax"/>
+    <field name="email"/>
+    <field name="note"/>
+    <field name="active"/>
+  </fields>
 </entity_store>
diff --git a/install-new/fixtures/apple/data/supplier.xml b/install-new/fixtures/apple/data/supplier.xml
index 8344eda96..1607fe0b8 100644
--- a/install-new/fixtures/apple/data/supplier.xml
+++ b/install-new/fixtures/apple/data/supplier.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_supplier>
-  <fields id="name" class="Supplier" image="su">
-    <field name="name"/>
-    <field name="active"/>
-  </fields>
   <entities>
     <supplier id="AppleStore" active="1">
       <name>AppleStore</name>
@@ -12,4 +8,8 @@
       <name>Shure Online Store</name>
     </supplier>
   </entities>
+  <fields id="name" class="Supplier" image="su">
+    <field name="name"/>
+    <field name="active"/>
+  </fields>
 </entity_supplier>
diff --git a/install-new/fixtures/apple/data/tag.xml b/install-new/fixtures/apple/data/tag.xml
index 2c4d15d51..e59a403dc 100644
--- a/install-new/fixtures/apple/data/tag.xml
+++ b/install-new/fixtures/apple/data/tag.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_tag>
+  <entities/>
   <fields>
     <field name="name" relation="product"/>
   </fields>
-  <entities/>
 </entity_tag>