diff --git a/install-new/classes/simplexml.php b/install-new/classes/simplexml.php
new file mode 100644
index 000000000..5cd612fb0
--- /dev/null
+++ b/install-new/classes/simplexml.php
@@ -0,0 +1,72 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class InstallSimplexmlElement extends SimpleXMLElement
+{
+	/**
+	 * Can add SimpleXMLElement values in XML tree
+	 *
+	 * @see SimpleXMLElement::addChild()
+	 */
+	public function addChild($name, $value = null, $namespace = null)
+	{
+		if ($value instanceof SimplexmlElement)
+		{
+			$content = trim((string)$value);
+			if (strlen($content) > 0)
+				$new_element = parent::addChild($name, str_replace('&', '&amp;', $content), $namespace);
+			else
+			{
+				$new_element = parent::addChild($name);
+				foreach ($value->attributes() as $k => $v)
+					$new_element->addAttribute($k, $v);
+			}
+
+			foreach ($value->children() as $child)
+				$new_element->addChild($child->getName(), $child);
+		}
+		else
+			return parent::addChild($name, str_replace('&', '&amp;', $value), $namespace);
+	}
+
+	/**
+	 * Generate nice and sweet XML
+	 *
+	 * @see SimpleXMLElement::asXML()
+	 */
+	public function asXML($filename = null)
+	{
+		$dom = new DOMDocument('1.0');
+		$dom->preserveWhiteSpace = false;
+		$dom->formatOutput = true;
+		$dom->loadXML(parent::asXML());
+
+		if ($filename)
+			return file_put_contents($filename, $dom->saveXML());
+		return $dom->saveXML();
+	}
+}
\ No newline at end of file
diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php
index e39d121f0..fadf414ad 100644
--- a/install-new/classes/xmlLoader.php
+++ b/install-new/classes/xmlLoader.php
@@ -346,7 +346,7 @@ class InstallXmlLoader
 			if (!file_exists($path))
 				throw new PrestashopInstallerException('XML data file '.$entity.'.xml not found');
 
-			if (!$this->cache_xml_entity[$this->path_type][$cache_id] = @simplexml_load_file($path))
+			if (!$this->cache_xml_entity[$this->path_type][$cache_id] = @simplexml_load_file($path, 'InstallSimplexmlElement'))
 				throw new PrestashopInstallerException('XML data file '.$entity.'.xml invalid');
 		}
 
@@ -683,7 +683,7 @@ class InstallXmlLoader
 		if (!$this->entityExists($entity))
 			return $info;
 
-		$xml = @simplexml_load_file($this->data_path.$entity.'.xml');
+		$xml = @simplexml_load_file($this->data_path.$entity.'.xml', 'InstallSimplexmlElement');
 		if (!$xml)
 			return $info;
 
@@ -764,7 +764,12 @@ class InstallXmlLoader
 				$field['relation'] = $info['relation'];
 		}
 
-		$this->writeNiceAndSweetXML($xml, $this->data_path.$entity.'.xml');
+		// Recreate entities nodes, in order to have the <entities> node after the <fields> node
+		$store_entities = clone $xml->entities;
+		unset($xml->entities);
+		$xml->addChild('entities', $store_entities);
+
+		$xml->asXML($this->data_path.$entity.'.xml');
 	}
 
 	/**
@@ -825,7 +830,7 @@ class InstallXmlLoader
 		unset($xml->entities);
 		$entities = $xml->addChild('entities');
 		$this->createXmlEntityNodes($entity, $content['nodes'], $entities);
-		$this->writeNiceAndSweetXML($xml, $this->data_path.$entity.'.xml');
+		$xml->asXML($this->data_path.$entity.'.xml');
 
 		// Generate multilang XML files
 		if ($content['nodes_lang'])
@@ -840,7 +845,7 @@ class InstallXmlLoader
 
 				$xml_node = new SimpleXMLElement('<entity_'.$entity.' />');
 				$this->createXmlEntityNodes($entity, $nodes, $xml_node);
-				$this->writeNiceAndSweetXML($xml_node, $this->lang_path.$iso.'/data/'.$entity.'.xml');
+				$xml_node->asXML($this->lang_path.$iso.'/data/'.$entity.'.xml');
 			}
 
 		if ($xml->fields['image'])
@@ -1048,8 +1053,7 @@ class InstallXmlLoader
 			foreach ($node as $k => $v)
 			{
 				if (isset($types[$k]) && $types[$k])
-					// Sadly SimpleXML is really stupid ...
-					$entity_node->addChild($k, str_replace('&', '&amp;', $v));
+					$entity_node->addChild($k, $v);
 				else
 					$entity_node[$k] = $v;
 			}
@@ -1137,16 +1141,4 @@ class InstallXmlLoader
 			if (file_exists($from_path.$tab->class_name.'.gif'))
 				copy($from_path.$tab->class_name.'.gif', $backup_path.$tab->class_name.'.gif');
 	}
-
-	/**
-	 * ONLY FOR DEVELOPMENT PURPOSE
-	 */
-	public function writeNiceAndSweetXML(SimpleXMLElement $xml, $filename)
-	{
-		$dom = new DOMDocument('1.0');
-		$dom->preserveWhiteSpace = false;
-		$dom->formatOutput = true;
-		$dom->loadXML($xml->asXML());
-		file_put_contents($filename, $dom->saveXML());
-	}
 }
\ No newline at end of file
diff --git a/install-new/data/xml/access.xml b/install-new/data/xml/access.xml
index ef368b7f4..a2eff04ba 100644
--- a/install-new/data/xml/access.xml
+++ b/install-new/data/xml/access.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_access>
+  <fields primary="id_profile, id_tab" sql="a.id_profile = 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_1_1" id_profile="SuperAdmin" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_2" id_profile="SuperAdmin" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
@@ -101,12 +109,4 @@
     <access id="access_1_109" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_110" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
   </entities>
-  <fields primary="id_profile, id_tab" sql="a.id_profile = 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/data/xml/address_format.xml b/install-new/data/xml/address_format.xml
index 20901acb7..466bb5720 100644
--- a/install-new/data/xml/address_format.xml
+++ b/install-new/data/xml/address_format.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_address_format>
+  <fields primary="id_country" class="AddressFormat">
+    <field name="id_country" relation="country"/>
+    <field name="format"/>
+  </fields>
   <entities>
     <address_format id="address_format_1" id_country="DE">
       <format>firstname lastname
@@ -2440,8 +2444,4 @@ Country:name
 phone</format>
     </address_format>
   </entities>
-  <fields primary="id_country" class="AddressFormat">
-    <field name="id_country" relation="country"/>
-    <field name="format"/>
-  </fields>
 </entity_address_format>
diff --git a/install-new/data/xml/carrier.xml b/install-new/data/xml/carrier.xml
index fe4e6f833..d4aed93b1 100644
--- a/install-new/data/xml/carrier.xml
+++ b/install-new/data/xml/carrier.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier>
-  <entities>
-    <carrier id="carrier_1" id_reference="1" id_tax_rules_group="0" active="1" shipping_handling="0" 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>0</name>
-      <url/>
-    </carrier>
-  </entities>
   <fields id="name" class="Carrier" sql="a.id_carrier = 1">
     <field name="id_reference"/>
     <field name="id_tax_rules_group"/>
@@ -24,4 +18,10 @@
     <field name="max_weight"/>
     <field name="grade"/>
   </fields>
+  <entities>
+    <carrier id="carrier_1" id_reference="1" id_tax_rules_group="0" active="1" shipping_handling="0" 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>0</name>
+      <url/>
+    </carrier>
+  </entities>
 </entity_carrier>
diff --git a/install-new/data/xml/carrier_group.xml b/install-new/data/xml/carrier_group.xml
index 161d25bd5..63ee20d09 100644
--- a/install-new/data/xml/carrier_group.xml
+++ b/install-new/data/xml/carrier_group.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier_group>
-  <entities/>
   <fields primary="id_carrier, id_group" sql="a.id_carrier = 1">
     <field name="id_carrier" relation="carrier"/>
     <field name="id_group" relation="group"/>
   </fields>
+  <entities/>
 </entity_carrier_group>
diff --git a/install-new/data/xml/carrier_zone.xml b/install-new/data/xml/carrier_zone.xml
index 69b5ceb64..eba14abc4 100644
--- a/install-new/data/xml/carrier_zone.xml
+++ b/install-new/data/xml/carrier_zone.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_carrier_zone>
-  <entities>
-    <carrier_zone id="carrier_zone_1_1" id_carrier="carrier_1" id_zone="Europe"/>
-  </entities>
   <fields primary="id_carrier, id_zone" sql="a.id_carrier = 1">
     <field name="id_carrier" relation="carrier"/>
     <field name="id_zone" relation="zone"/>
   </fields>
+  <entities>
+    <carrier_zone id="carrier_zone_1_1" id_carrier="carrier_1" id_zone="Europe"/>
+  </entities>
 </entity_carrier_zone>
diff --git a/install-new/data/xml/category.xml b/install-new/data/xml/category.xml
index 7bb81cc80..5fdd43b44 100644
--- a/install-new/data/xml/category.xml
+++ b/install-new/data/xml/category.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-  <entities>
-    <category id="Home" id_parent="" active="1"/>
-  </entities>
   <fields id="name" class="Category" sql="a.id_category = 1">
     <field name="id_parent" relation="category"/>
     <field name="active"/>
   </fields>
+  <entities>
+    <category id="Home" id_parent="" active="1"/>
+  </entities>
 </entity_category>
diff --git a/install-new/data/xml/category_group.xml b/install-new/data/xml/category_group.xml
index 01f5f8db8..a61018734 100644
--- a/install-new/data/xml/category_group.xml
+++ b/install-new/data/xml/category_group.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <entity_category_group>
+  <fields primary="id_category, id_group" sql="a.id_category = 1">
+    <field name="id_category" relation="category"/>
+    <field name="id_group" relation="group"/>
+  </fields>
   <entities>
     <category_group id="category_group_1_1" id_category="Home" id_group="Unidentified"/>
     <category_group id="category_group_1_2" id_category="Home" id_group="Guest"/>
     <category_group id="category_group_1_3" id_category="Home" id_group="Default"/>
   </entities>
-  <fields primary="id_category, id_group" sql="a.id_category = 1">
-    <field name="id_category" relation="category"/>
-    <field name="id_group" relation="group"/>
-  </fields>
 </entity_category_group>
diff --git a/install-new/data/xml/cms.xml b/install-new/data/xml/cms.xml
index 1f1eef6e6..b8ca83e16 100644
--- a/install-new/data/xml/cms.xml
+++ b/install-new/data/xml/cms.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_cms>
+  <fields id="meta_title" class="CMS">
+    <field name="id_cms_category" relation="cms_category"/>
+    <field name="active"/>
+  </fields>
   <entities>
     <cms id="Delivery" id_cms_category="Home" active="1"/>
     <cms id="Legal_Notice" id_cms_category="Home" active="1"/>
@@ -7,8 +11,4 @@
     <cms id="About_us" id_cms_category="Home" active="1"/>
     <cms id="Secure_payment" id_cms_category="Home" active="1"/>
   </entities>
-  <fields id="meta_title" class="CMS">
-    <field name="id_cms_category" relation="cms_category"/>
-    <field name="active"/>
-  </fields>
 </entity_cms>
diff --git a/install-new/data/xml/cms_category.xml b/install-new/data/xml/cms_category.xml
index 730951149..33d4e3d2d 100644
--- a/install-new/data/xml/cms_category.xml
+++ b/install-new/data/xml/cms_category.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_cms_category>
-  <entities>
-    <cms_category id="Home" id_parent="" active="1"/>
-  </entities>
   <fields id="name" class="CMSCategory">
     <field name="id_parent" relation="cms_category"/>
     <field name="active"/>
   </fields>
+  <entities>
+    <cms_category id="Home" id_parent="" active="1"/>
+  </entities>
 </entity_cms_category>
diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
index 6b261385d..d22dde676 100644
--- a/install-new/data/xml/configuration.xml
+++ b/install-new/data/xml/configuration.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_configuration>
+  <fields id="name" class="Configuration" null="1">
+    <field name="name"/>
+    <field name="value"/>
+  </fields>
   <entities>
     <configuration id="PS_LANG_DEFAULT" name="PS_LANG_DEFAULT">
       <value>2</value>
@@ -848,17 +852,13 @@
       <value>0</value>
     </configuration>
     <configuration id="PS_INVOICE_MODEL" name="PS_INVOICE_MODEL">
-        <value>invoice</value>
+      <value>invoice</value>
     </configuration>
     <configuration id="PS_LIMIT_UPLOAD_IMAGE_VALUE" name="PS_LIMIT_UPLOAD_IMAGE_VALUE">
-        <value>2</value>
+      <value>2</value>
     </configuration>
     <configuration id="PS_LIMIT_UPLOAD_FILE_VALUE" name="PS_LIMIT_UPLOAD_FILE_VALUE">
-        <value>2</value>
+      <value>2</value>
     </configuration>
   </entities>
-  <fields id="name" class="Configuration" null="1">
-    <field name="name"/>
-    <field name="value"/>
-  </fields>
 </entity_configuration>
diff --git a/install-new/data/xml/contact.xml b/install-new/data/xml/contact.xml
index 45da756a4..9f8034390 100644
--- a/install-new/data/xml/contact.xml
+++ b/install-new/data/xml/contact.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_contact>
+  <fields id="name" class="Contact">
+    <field name="customer_service"/>
+  </fields>
   <entities>
     <contact id="Webmaster" customer_service="1"/>
     <contact id="Customer_service" customer_service="1"/>
   </entities>
-  <fields id="name" class="Contact">
-    <field name="customer_service"/>
-  </fields>
 </entity_contact>
diff --git a/install-new/data/xml/country.xml b/install-new/data/xml/country.xml
index c61b8e9f1..2bb63d79d 100644
--- a/install-new/data/xml/country.xml
+++ b/install-new/data/xml/country.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_country>
+  <fields id="iso_code" class="Country">
+    <field name="id_zone" relation="zone"/>
+    <field name="iso_code"/>
+    <field name="call_prefix"/>
+    <field name="active"/>
+    <field name="contains_states"/>
+    <field name="need_identification_number"/>
+    <field name="need_zip_code"/>
+    <field name="zip_code_format"/>
+    <field name="display_tax_label"/>
+  </fields>
   <entities>
     <country id="DE" id_zone="Europe" iso_code="DE" call_prefix="49" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/>
     <country id="AT" id_zone="Europe" iso_code="AT" call_prefix="43" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNN" display_tax_label="1"/>
@@ -246,15 +257,4 @@
     <country id="TF" id_zone="Oceania" iso_code="TF" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="" display_tax_label="1"/>
     <country id="AX" id_zone="Europe_out_E_U" iso_code="AX" call_prefix="0" active="1" contains_states="0" need_identification_number="0" need_zip_code="1" zip_code_format="NNNNN" display_tax_label="1"/>
   </entities>
-  <fields id="iso_code" class="Country">
-    <field name="id_zone" relation="zone"/>
-    <field name="iso_code"/>
-    <field name="call_prefix"/>
-    <field name="active"/>
-    <field name="contains_states"/>
-    <field name="need_identification_number"/>
-    <field name="need_zip_code"/>
-    <field name="zip_code_format"/>
-    <field name="display_tax_label"/>
-  </fields>
 </entity_country>
diff --git a/install-new/data/xml/delivery.xml b/install-new/data/xml/delivery.xml
index fc42bd63c..9e8bc85c9 100644
--- a/install-new/data/xml/delivery.xml
+++ b/install-new/data/xml/delivery.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <entity_delivery>
-  <entities/>
   <fields class="Delivery" sql="a.id_carrier = 1">
     <field name="id_shop"/>
     <field name="id_group_shop"/>
@@ -10,4 +9,5 @@
     <field name="id_zone" relation="zone"/>
     <field name="price"/>
   </fields>
+  <entities/>
 </entity_delivery>
diff --git a/install-new/data/xml/gender.xml b/install-new/data/xml/gender.xml
index 8baeadefd..fd324a60d 100644
--- a/install-new/data/xml/gender.xml
+++ b/install-new/data/xml/gender.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_gender>
+  <fields id="name" class="Gender" image="genders">
+    <field name="type"/>
+  </fields>
   <entities>
     <gender id="Mr" type="0"/>
     <gender id="Ms" type="1"/>
     <gender id="Miss" type="1"/>
   </entities>
-  <fields id="name" class="Gender" image="genders">
-    <field name="type"/>
-  </fields>
 </entity_gender>
diff --git a/install-new/data/xml/group.xml b/install-new/data/xml/group.xml
index f79fbc040..32324b599 100644
--- a/install-new/data/xml/group.xml
+++ b/install-new/data/xml/group.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_group>
-  <entities>
-    <group id="Visitor" reduction="0.00" price_display_method="0" show_prices="1"/>
-    <group id="Guest" reduction="0.00" price_display_method="0" show_prices="1"/>
-    <group id="Customer" reduction="0.00" price_display_method="0" show_prices="1"/>
-  </entities>
   <fields id="name" class="Group">
     <field name="reduction"/>
     <field name="price_display_method"/>
     <field name="show_prices"/>
   </fields>
+  <entities>
+    <group id="Visitor" reduction="0.00" price_display_method="0" show_prices="1"/>
+    <group id="Guest" reduction="0.00" price_display_method="0" show_prices="1"/>
+    <group id="Customer" reduction="0.00" price_display_method="0" show_prices="1"/>
+  </entities>
 </entity_group>
diff --git a/install-new/data/xml/hook_alias.xml b/install-new/data/xml/hook_alias.xml
index af93a761b..78faaa98f 100644
--- a/install-new/data/xml/hook_alias.xml
+++ b/install-new/data/xml/hook_alias.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_hook_alias>
+  <fields id="alias">
+    <field name="alias"/>
+    <field name="name"/>
+  </fields>
   <entities>
     <hook_alias id="payment">
       <alias>payment</alias>
@@ -342,8 +346,4 @@
       <name>actionTaxManager</name>
     </hook_alias>
   </entities>
-  <fields id="alias">
-    <field name="alias"/>
-    <field name="name"/>
-  </fields>
 </entity_hook_alias>
diff --git a/install-new/data/xml/image_type.xml b/install-new/data/xml/image_type.xml
index 80a3a99ae..0c72134bf 100644
--- a/install-new/data/xml/image_type.xml
+++ b/install-new/data/xml/image_type.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_image_type>
-  <entities>
-    <image_type id="small" id_theme="default" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="medium" id_theme="default" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
-    <image_type id="large" id_theme="default" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="thickbox" id_theme="default" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="category" id_theme="default" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="home" id_theme="default" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="large_scene" id_theme="default" name="large_scene" width="556" height="200" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
-    <image_type id="thumb_scene" id_theme="default" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
-  </entities>
   <fields id="name" class="ImageType">
     <field name="id_theme" relation="theme"/>
     <field name="name"/>
@@ -22,4 +12,14 @@
     <field name="scenes"/>
     <field name="stores"/>
   </fields>
+  <entities>
+    <image_type id="small" id_theme="default" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="medium" id_theme="default" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
+    <image_type id="large" id_theme="default" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="thickbox" id_theme="default" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="category" id_theme="default" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="home" id_theme="default" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="large_scene" id_theme="default" name="large_scene" width="556" height="200" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+    <image_type id="thumb_scene" id_theme="default" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+  </entities>
 </entity_image_type>
diff --git a/install-new/data/xml/meta.xml b/install-new/data/xml/meta.xml
index 55bcd3672..1afd028dc 100644
--- a/install-new/data/xml/meta.xml
+++ b/install-new/data/xml/meta.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_meta>
+  <fields id="page" class="Meta">
+    <field name="page"/>
+  </fields>
   <entities>
     <meta id="404">
       <page>404</page>
@@ -77,7 +80,4 @@
       <page>guest-tracking</page>
     </meta>
   </entities>
-  <fields id="page" class="Meta">
-    <field name="page"/>
-  </fields>
 </entity_meta>
diff --git a/install-new/data/xml/operating_system.xml b/install-new/data/xml/operating_system.xml
index 733f82677..d77191e76 100644
--- a/install-new/data/xml/operating_system.xml
+++ b/install-new/data/xml/operating_system.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_operating_system>
+  <fields id="name">
+    <field name="name"/>
+  </fields>
   <entities>
     <operating_system id="Windows_XP">
       <name>Windows XP</name>
@@ -14,7 +17,4 @@
       <name>Linux</name>
     </operating_system>
   </entities>
-  <fields id="name">
-    <field name="name"/>
-  </fields>
 </entity_operating_system>
diff --git a/install-new/data/xml/order_return_state.xml b/install-new/data/xml/order_return_state.xml
index fdd5d495a..620a03dbf 100644
--- a/install-new/data/xml/order_return_state.xml
+++ b/install-new/data/xml/order_return_state.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_return_state>
+  <fields id="name" class="OrderReturnState">
+    <field name="color"/>
+  </fields>
   <entities>
     <order_return_state id="Waiting_for_confirmation" color="RoyalBlue"/>
     <order_return_state id="Waiting_for_package" color="BlueViolet"/>
@@ -7,7 +10,4 @@
     <order_return_state id="Return_denied" color="Crimson"/>
     <order_return_state id="Return_completed" color="#108510"/>
   </entities>
-  <fields id="name" class="OrderReturnState">
-    <field name="color"/>
-  </fields>
 </entity_order_return_state>
diff --git a/install-new/data/xml/order_state.xml b/install-new/data/xml/order_state.xml
index 537e60edd..77b2eaefd 100644
--- a/install-new/data/xml/order_state.xml
+++ b/install-new/data/xml/order_state.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_state>
+  <fields id="name" class="OrderState" image="os">
+    <field name="invoice"/>
+    <field name="send_email"/>
+    <field name="color"/>
+    <field name="unremovable"/>
+    <field name="hidden"/>
+    <field name="logable"/>
+    <field name="delivery"/>
+    <field name="shipped"/>
+    <field name="paid"/>
+  </fields>
   <entities>
     <order_state id="Awaiting_cheque_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
     <order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
@@ -14,15 +25,4 @@
     <order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
     <order_state id="Payment_remotely_accepted" invoice="1" send_email="0" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
   </entities>
-  <fields id="name" class="OrderState" image="os">
-    <field name="invoice"/>
-    <field name="send_email"/>
-    <field name="color"/>
-    <field name="unremovable"/>
-    <field name="hidden"/>
-    <field name="logable"/>
-    <field name="delivery"/>
-    <field name="shipped"/>
-    <field name="paid"/>
-  </fields>
 </entity_order_state>
diff --git a/install-new/data/xml/profile.xml b/install-new/data/xml/profile.xml
index fce9aa157..557a09f5c 100644
--- a/install-new/data/xml/profile.xml
+++ b/install-new/data/xml/profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_profile>
+  <fields id="name" class="Profile" sql="a.id_profile = 1"/>
   <entities>
     <profile id="SuperAdmin"/>
   </entities>
-  <fields id="name" class="Profile" sql="a.id_profile = 1"/>
 </entity_profile>
diff --git a/install-new/data/xml/quick_access.xml b/install-new/data/xml/quick_access.xml
index d924fa040..2097553e1 100644
--- a/install-new/data/xml/quick_access.xml
+++ b/install-new/data/xml/quick_access.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_quick_access>
+  <fields id="name" class="QuickAccess">
+    <field name="new_window"/>
+    <field name="link"/>
+  </fields>
   <entities>
     <quick_access id="Home" new_window="0">
       <link>index.php</link>
@@ -17,8 +21,4 @@
       <link>index.php?controller=AdminCartRules&amp;addcart_rule</link>
     </quick_access>
   </entities>
-  <fields id="name" class="QuickAccess">
-    <field name="new_window"/>
-    <field name="link"/>
-  </fields>
 </entity_quick_access>
diff --git a/install-new/data/xml/risk.xml b/install-new/data/xml/risk.xml
index 0fd39d6cf..c8a17a7c2 100644
--- a/install-new/data/xml/risk.xml
+++ b/install-new/data/xml/risk.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <entity_risk>
+  <fields id="name" class="Risk">
+    <field name="percent"/>
+    <field name="color"/>
+  </fields>
   <entities>
     <risk id="None" percent="0" color="LimeGreen"/>
     <risk id="Low" percent="35" color="DarkOrange"/>
     <risk id="Middle" percent="75" color="Crimson"/>
     <risk id="Hight" percent="100" color="#ec2e15"/>
   </entities>
-  <fields id="name" class="Risk">
-    <field name="percent"/>
-    <field name="color"/>
-  </fields>
 </entity_risk>
diff --git a/install-new/data/xml/search_engine.xml b/install-new/data/xml/search_engine.xml
index 67544ff7f..411a27ff8 100644
--- a/install-new/data/xml/search_engine.xml
+++ b/install-new/data/xml/search_engine.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_search_engine>
+  <fields id="server" class="SearchEngine">
+    <field name="server"/>
+    <field name="getvar"/>
+  </fields>
   <entities>
     <search_engine id="google" getvar="q">
       <server>google</server>
@@ -116,8 +120,4 @@
       <server>rambler</server>
     </search_engine>
   </entities>
-  <fields id="server" class="SearchEngine">
-    <field name="server"/>
-    <field name="getvar"/>
-  </fields>
 </entity_search_engine>
diff --git a/install-new/data/xml/state.xml b/install-new/data/xml/state.xml
index 11deaa7d9..5f48d0706 100644
--- a/install-new/data/xml/state.xml
+++ b/install-new/data/xml/state.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_state>
+  <fields id="iso_code" class="State">
+    <field name="id_country" relation="country"/>
+    <field name="id_zone" relation="zone"/>
+    <field name="name"/>
+    <field name="iso_code"/>
+    <field name="tax_behavior"/>
+    <field name="active"/>
+  </fields>
   <entities>
     <state id="AL" id_country="US" id_zone="North_America" iso_code="AL" tax_behavior="0" active="1">
       <name>Alabama</name>
@@ -938,12 +946,4 @@
       <name>Yamanashi</name>
     </state>
   </entities>
-  <fields id="iso_code" class="State">
-    <field name="id_country" relation="country"/>
-    <field name="id_zone" relation="zone"/>
-    <field name="name"/>
-    <field name="iso_code"/>
-    <field name="tax_behavior"/>
-    <field name="active"/>
-  </fields>
 </entity_state>
diff --git a/install-new/data/xml/stock_mvt_reason.xml b/install-new/data/xml/stock_mvt_reason.xml
index 5042367c9..93ce8d919 100644
--- a/install-new/data/xml/stock_mvt_reason.xml
+++ b/install-new/data/xml/stock_mvt_reason.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_stock_mvt_reason>
+  <fields id="name" class="StockMvtReason">
+    <field name="sign"/>
+  </fields>
   <entities>
     <stock_mvt_reason id="Increase" sign="1"/>
     <stock_mvt_reason id="Decrease" sign="-1"/>
@@ -10,7 +13,4 @@
     <stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/>
     <stock_mvt_reason id="Supply_Order" sign="1"/>
   </entities>
-  <fields id="name" class="StockMvtReason">
-    <field name="sign"/>
-  </fields>
 </entity_stock_mvt_reason>
diff --git a/install-new/data/xml/subdomain.xml b/install-new/data/xml/subdomain.xml
index 9e50bf9b0..07156939b 100644
--- a/install-new/data/xml/subdomain.xml
+++ b/install-new/data/xml/subdomain.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_subdomain>
-  <entities>
-    <subdomain id="www" name="www"/>
-  </entities>
   <fields id="name" class="SubDomain">
     <field name="name"/>
   </fields>
+  <entities>
+    <subdomain id="www" name="www"/>
+  </entities>
 </entity_subdomain>
diff --git a/install-new/data/xml/supply_order_state.xml b/install-new/data/xml/supply_order_state.xml
index d420894a4..f7a0299d3 100644
--- a/install-new/data/xml/supply_order_state.xml
+++ b/install-new/data/xml/supply_order_state.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0"?>
 <entity_supply_order_state>
-  <entities>
-    <supply_order_state id="supply_order_state_1" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00"/>
-    <supply_order_state id="supply_order_state_2" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff"/>
-    <supply_order_state id="supply_order_state_3" delivery_note="0" editable="0" receipt_state="0" pending_receipt="1" enclosed="0" color="#ff37f5"/>
-    <supply_order_state id="supply_order_state_4" delivery_note="0" editable="0" receipt_state="1" pending_receipt="1" enclosed="0" color="#ff3e33"/>
-    <supply_order_state id="supply_order_state_5" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c"/>
-    <supply_order_state id="supply_order_state_6" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666"/>
-  </entities>
   <fields class="SupplyOrderState">
     <field name="delivery_note"/>
     <field name="editable"/>
@@ -16,4 +8,12 @@
     <field name="enclosed"/>
     <field name="color"/>
   </fields>
+  <entities>
+    <supply_order_state id="supply_order_state_1" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00"/>
+    <supply_order_state id="supply_order_state_2" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff"/>
+    <supply_order_state id="supply_order_state_3" delivery_note="0" editable="0" receipt_state="0" pending_receipt="1" enclosed="0" color="#ff37f5"/>
+    <supply_order_state id="supply_order_state_4" delivery_note="0" editable="0" receipt_state="1" pending_receipt="1" enclosed="0" color="#ff3e33"/>
+    <supply_order_state id="supply_order_state_5" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c"/>
+    <supply_order_state id="supply_order_state_6" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666"/>
+  </entities>
 </entity_supply_order_state>
diff --git a/install-new/data/xml/tab.xml b/install-new/data/xml/tab.xml
index 16cb83f93..bc8973379 100644
--- a/install-new/data/xml/tab.xml
+++ b/install-new/data/xml/tab.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_tab>
+  <fields id="name" class="Tab" ordersql="a.id_parent, a.position" image="t">
+    <field name="id_parent" relation="tab"/>
+    <field name="class_name"/>
+    <field name="active"/>
+  </fields>
   <entities>
     <tab id="Home" id_parent="-1" active="1">
       <class_name>AdminHome</class_name>
@@ -299,9 +304,4 @@
       <class_name>AdminAccountingExport</class_name>
     </tab>
   </entities>
-  <fields id="name" class="Tab" ordersql="a.id_parent, a.position" image="t">
-    <field name="id_parent" relation="tab"/>
-    <field name="class_name"/>
-    <field name="active"/>
-  </fields>
 </entity_tab>
diff --git a/install-new/data/xml/theme.xml b/install-new/data/xml/theme.xml
index f7ebcf3ee..881be4e2b 100644
--- a/install-new/data/xml/theme.xml
+++ b/install-new/data/xml/theme.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_theme>
+  <fields id="name" class="Theme">
+    <field name="name"/>
+  </fields>
   <entities>
     <theme id="default">
       <name>default</name>
     </theme>
   </entities>
-  <fields id="name" class="Theme">
-    <field name="name"/>
-  </fields>
 </entity_theme>
diff --git a/install-new/data/xml/timezone.xml b/install-new/data/xml/timezone.xml
index 98fe5d8e0..ca6ac4138 100644
--- a/install-new/data/xml/timezone.xml
+++ b/install-new/data/xml/timezone.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_timezone>
+  <fields id="name">
+    <field name="name"/>
+  </fields>
   <entities>
     <timezone id="Africa_Abidjan" name="Africa/Abidjan"/>
     <timezone id="Africa_Accra" name="Africa/Accra"/>
@@ -562,7 +565,4 @@
     <timezone id="WET" name="WET"/>
     <timezone id="Zulu" name="Zulu"/>
   </entities>
-  <fields id="name">
-    <field name="name"/>
-  </fields>
 </entity_timezone>
diff --git a/install-new/data/xml/warehouse.xml b/install-new/data/xml/warehouse.xml
index 746c2af88..f9b165670 100644
--- a/install-new/data/xml/warehouse.xml
+++ b/install-new/data/xml/warehouse.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_warehouse>
-  <entities/>
   <fields id="name" class="Warehouse">
     <field name="id_currency"/>
     <field name="id_address" relation="address"/>
@@ -9,4 +8,5 @@
     <field name="name"/>
     <field name="management_type"/>
   </fields>
+  <entities/>
 </entity_warehouse>
diff --git a/install-new/data/xml/web_browser.xml b/install-new/data/xml/web_browser.xml
index 28fc73312..4d31db30f 100644
--- a/install-new/data/xml/web_browser.xml
+++ b/install-new/data/xml/web_browser.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_web_browser>
+  <fields id="name">
+    <field name="name"/>
+  </fields>
   <entities>
     <web_browser id="Safari">
       <name>Safari</name>
@@ -26,7 +29,4 @@
       <name>Google Chrome</name>
     </web_browser>
   </entities>
-  <fields id="name">
-    <field name="name"/>
-  </fields>
 </entity_web_browser>
diff --git a/install-new/data/xml/zone.xml b/install-new/data/xml/zone.xml
index 08126df94..1213ee9e7 100644
--- a/install-new/data/xml/zone.xml
+++ b/install-new/data/xml/zone.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_zone>
+  <fields id="name" class="Zone">
+    <field name="name"/>
+    <field name="active"/>
+  </fields>
   <entities>
     <zone id="Europe" active="1">
       <name>Europe</name>
@@ -26,8 +30,4 @@
       <name>Centrale America/Antilla</name>
     </zone>
   </entities>
-  <fields id="name" class="Zone">
-    <field name="name"/>
-    <field name="active"/>
-  </fields>
 </entity_zone>
diff --git a/install-new/fixtures/apple/data/access.xml b/install-new/fixtures/apple/data/access.xml
index e7a1fbc4d..5d583acba 100644
--- a/install-new/fixtures/apple/data/access.xml
+++ b/install-new/fixtures/apple/data/access.xml
@@ -1,5 +1,13 @@
 <?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"/>
@@ -394,12 +402,4 @@
     <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 52bfe6687..70908e94f 100644
--- a/install-new/fixtures/apple/data/address.xml
+++ b/install-new/fixtures/apple/data/address.xml
@@ -1,19 +1,5 @@
 <?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"/>
@@ -36,4 +22,18 @@
     <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 c4f4e06bf..c734f41c0 100644
--- a/install-new/fixtures/apple/data/alias.xml
+++ b/install-new/fixtures/apple/data/alias.xml
@@ -1,5 +1,10 @@
 <?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>
@@ -10,9 +15,4 @@
       <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 2793e95c8..57f1343ba 100644
--- a/install-new/fixtures/apple/data/attribute.xml
+++ b/install-new/fixtures/apple/data/attribute.xml
@@ -1,5 +1,9 @@
 <?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=""/>
@@ -22,8 +26,4 @@
     <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 001170244..04c30c826 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 df9c3da9d..52b6b3b6f 100644
--- a/install-new/fixtures/apple/data/carrier.xml
+++ b/install-new/fixtures/apple/data/carrier.xml
@@ -1,11 +1,5 @@
 <?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"/>
@@ -24,4 +18,10 @@
     <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 e711c8eae..f663f440f 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 694f53933..59390cfd6 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>
-  <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>
+  <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>
 </entity_carrier_zone>
diff --git a/install-new/fixtures/apple/data/cart.xml b/install-new/fixtures/apple/data/cart.xml
index e691c2d27..6d299fa5a 100644
--- a/install-new/fixtures/apple/data/cart.xml
+++ b/install-new/fixtures/apple/data/cart.xml
@@ -1,11 +1,5 @@
 <?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"/>
@@ -20,4 +14,10 @@
     <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 8dfd20d88..2dc8e62e5 100644
--- a/install-new/fixtures/apple/data/cart_product.xml
+++ b/install-new/fixtures/apple/data/cart_product.xml
@@ -1,9 +1,5 @@
 <?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"/>
@@ -11,4 +7,8 @@
     <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 a7cebb686..2eb06c28c 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 90fc59d44..c92e4246d 100644
--- a/install-new/fixtures/apple/data/category_group.xml
+++ b/install-new/fixtures/apple/data/category_group.xml
@@ -1,5 +1,9 @@
 <?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"/>
@@ -11,8 +15,4 @@
     <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 07554841e..61fa8c812 100644
--- a/install-new/fixtures/apple/data/category_product.xml
+++ b/install-new/fixtures/apple/data/category_product.xml
@@ -1,5 +1,9 @@
 <?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"/>
@@ -13,8 +17,4 @@
     <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 13f69255b..2395fcce7 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 5e4c2aaea..2f064dcac 100644
--- a/install-new/fixtures/apple/data/customer.xml
+++ b/install-new/fixtures/apple/data/customer.xml
@@ -1,11 +1,5 @@
 <?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"/>
@@ -24,4 +18,10 @@
     <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 045f5d80e..eee528aa0 100644
--- a/install-new/fixtures/apple/data/delivery.xml
+++ b/install-new/fixtures/apple/data/delivery.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_delivery>
-  <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"/>
@@ -15,4 +9,10 @@
     <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 966674780..863bdfd89 100644
--- a/install-new/fixtures/apple/data/feature.xml
+++ b/install-new/fixtures/apple/data/feature.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_feature>
+  <fields id="name" class="Feature"/>
   <entities>
     <feature id="Height"/>
     <feature id="Width"/>
@@ -7,5 +8,4 @@
     <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 5c7987977..55b50f4f5 100644
--- a/install-new/fixtures/apple/data/feature_value.xml
+++ b/install-new/fixtures/apple/data/feature_value.xml
@@ -1,5 +1,9 @@
 <?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"/>
@@ -16,8 +20,4 @@
     <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 243c1922a..8477fcd55 100644
--- a/install-new/fixtures/apple/data/guest.xml
+++ b/install-new/fixtures/apple/data/guest.xml
@@ -1,8 +1,5 @@
 <?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"/>
@@ -19,4 +16,7 @@
     <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 7a2c16603..f96ae20ae 100644
--- a/install-new/fixtures/apple/data/image.xml
+++ b/install-new/fixtures/apple/data/image.xml
@@ -1,5 +1,9 @@
 <?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"/>
@@ -28,8 +32,4 @@
     <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 b861aa71d..984429e56 100644
--- a/install-new/fixtures/apple/data/manufacturer.xml
+++ b/install-new/fixtures/apple/data/manufacturer.xml
@@ -1,5 +1,9 @@
 <?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>
@@ -8,8 +12,4 @@
       <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 cec85cad4..f838beeee 100644
--- a/install-new/fixtures/apple/data/order_detail.xml
+++ b/install-new/fixtures/apple/data/order_detail.xml
@@ -1,15 +1,5 @@
 <?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"/>
@@ -52,4 +42,14 @@
     <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 95d994315..22d8c6ca8 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 ff2864da8..1c9a0e3e2 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 aa857fe32..8334205d1 100644
--- a/install-new/fixtures/apple/data/orders.xml
+++ b/install-new/fixtures/apple/data/orders.xml
@@ -1,12 +1,5 @@
 <?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"/>
@@ -44,4 +37,11 @@
     <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 1a48a1ef1..34537f6cf 100644
--- a/install-new/fixtures/apple/data/product.xml
+++ b/install-new/fixtures/apple/data/product.xml
@@ -1,35 +1,5 @@
 <?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"/>
@@ -71,4 +41,34 @@
     <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 fb260f2e9..4d6c14415 100644
--- a/install-new/fixtures/apple/data/product_attribute.xml
+++ b/install-new/fixtures/apple/data/product_attribute.xml
@@ -1,5 +1,22 @@
 <?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/>
@@ -83,21 +100,4 @@
       <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 979a3c0b8..0c461960d 100644
--- a/install-new/fixtures/apple/data/product_attribute_combination.xml
+++ b/install-new/fixtures/apple/data/product_attribute_combination.xml
@@ -1,5 +1,9 @@
 <?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"/>
@@ -53,8 +57,4 @@
     <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 8aafddde7..0d235050a 100644
--- a/install-new/fixtures/apple/data/product_attribute_image.xml
+++ b/install-new/fixtures/apple/data/product_attribute_image.xml
@@ -1,5 +1,9 @@
 <?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=""/>
@@ -29,8 +33,4 @@
     <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 37fc91287..59c4ce5ab 100644
--- a/install-new/fixtures/apple/data/product_supplier.xml
+++ b/install-new/fixtures/apple/data/product_supplier.xml
@@ -1,5 +1,12 @@
 <?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"/>
@@ -36,11 +43,4 @@
     <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 706ba7fce..e936c897e 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 a52ce5aac..ce420575e 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 ab2b430d5..ce95fa9f5 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 fd41f2155..c519b20a7 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 28a43830c..3d0699022 100644
--- a/install-new/fixtures/apple/data/specific_price.xml
+++ b/install-new/fixtures/apple/data/specific_price.xml
@@ -1,8 +1,5 @@
 <?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"/>
@@ -20,4 +17,7 @@
     <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 7d2cb6880..9d64af8b3 100644
--- a/install-new/fixtures/apple/data/stock_available.xml
+++ b/install-new/fixtures/apple/data/stock_available.xml
@@ -1,5 +1,14 @@
 <?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"/>
@@ -36,13 +45,4 @@
     <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 ec698d79a..e59814abc 100644
--- a/install-new/fixtures/apple/data/store.xml
+++ b/install-new/fixtures/apple/data/store.xml
@@ -1,5 +1,22 @@
 <?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>
@@ -32,7 +49,7 @@
       <name>Coconut Grove</name>
       <address1>2999 SW 32nd Avenue</address1>
       <address2/>
-      <city> Miami</city>
+      <city>Miami</city>
       <hours>a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";}</hours>
       <email/>
       <note/>
@@ -47,21 +64,4 @@
       <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 1607fe0b8..8344eda96 100644
--- a/install-new/fixtures/apple/data/supplier.xml
+++ b/install-new/fixtures/apple/data/supplier.xml
@@ -1,5 +1,9 @@
 <?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>
@@ -8,8 +12,4 @@
       <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 e59a403dc..2c4d15d51 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>
diff --git a/install-new/init.php b/install-new/init.php
index 0c113fa35..8f0691213 100644
--- a/install-new/init.php
+++ b/install-new/init.php
@@ -51,6 +51,7 @@ require_once _PS_INSTALL_PATH_.'classes/model.php';
 require_once _PS_INSTALL_PATH_.'classes/session.php';
 require_once _PS_INSTALL_PATH_.'classes/sqlLoader.php';
 require_once _PS_INSTALL_PATH_.'classes/xmlLoader.php';
+require_once _PS_INSTALL_PATH_.'classes/simplexml.php';
 
 class InstallLog
 {