// Update new installer

install-new/classes/xmlLoader.php

@@ -50,6 +50,7 @@ class InstallXmlLoader
 	protected $data_path;
 	protected $lang_path;
 	protected $img_path;
+	public $path_type;
 
 	protected $ids = array();
 
@@ -72,6 +73,7 @@ class InstallXmlLoader
 
 	public function setDefaultPath()
 	{
+		$this->path_type = 'common';
 		$this->data_path = _PS_INSTALL_DATA_PATH_.'xml/';
 		$this->lang_path = _PS_INSTALL_LANGS_PATH_;
 		$this->img_path = _PS_INSTALL_DATA_PATH_.'img/';
@@ -79,6 +81,7 @@ class InstallXmlLoader
 
 	public function setFixturesPath()
 	{
+		$this->path_type = 'fixture';
 		$this->data_path = _PS_INSTALL_FIXTURES_PATH_.'apple/data/';
 		$this->lang_path = _PS_INSTALL_FIXTURES_PATH_.'apple/langs/';
 		$this->img_path = _PS_INSTALL_FIXTURES_PATH_.'apple/img/';
@@ -336,7 +339,7 @@ class InstallXmlLoader
 		if ($iso)
 			$cache_id .= ':'.$iso;
 
-		if (!isset($this->cache_xml_entity[$cache_id]))
+		if (!isset($this->cache_xml_entity[$this->path_type][$cache_id]))
 		{
 			$path = $this->data_path.$entity.'.xml';
 			if ($iso)
@@ -345,11 +348,11 @@ class InstallXmlLoader
 			if (!file_exists($path))
 				throw new PrestashopInstallerException('XML data file '.$entity.'.xml not found');
 
-			if (!$this->cache_xml_entity[$cache_id] = @simplexml_load_file($path))
+			if (!$this->cache_xml_entity[$this->path_type][$cache_id] = @simplexml_load_file($path))
 				throw new PrestashopInstallerException('XML data file '.$entity.'.xml invalid');
 		}
 
-		return $this->cache_xml_entity[$cache_id];
+		return $this->cache_xml_entity[$this->path_type][$cache_id];
 	}
 
 	/**
@@ -591,7 +594,7 @@ class InstallXmlLoader
 				$columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']);
 		}
 
-		$exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'position', 'deleted', 'id_lang', 'id_shop', 'id_group_shop'), $exclude);
+		$exclude = array_merge(array('id_'.$table, 'date_add', 'date_upd', 'position', 'deleted', 'id_lang'), $exclude);
 
 		$list = array();
 		foreach ($columns[$table] as $k => $v)
@@ -886,6 +889,7 @@ class InstallXmlLoader
 		$alias_multilang = array();
 		if ($is_multilang)
 		{
+			$columns = $this->getColumns($entity);
 			$multilang_columns = $this->getColumns($entity, true);
 
 			// If some columns from _lang table have same name than original table, rename them (E.g. value in configuration)
@@ -1002,7 +1006,7 @@ class InstallXmlLoader
 		if (!$primary)
 			return '';
 
-		if (!$id_format || !$row)
+		if (!$id_format || !$row || !$row[$id_format])
 			$ids[$entity][$primary] = $entity.'_'.$primary;
 		else
 		{

install-new/data/db_structure.sql

@@ -23,6 +23,7 @@ CREATE TABLE `PREFIX_address` (
   `id_customer` int(10) unsigned NOT NULL default '0',
   `id_manufacturer` int(10) unsigned NOT NULL default '0',
   `id_supplier` int(10) unsigned NOT NULL default '0',
+  `id_warehouse` int(10) unsigned NOT NULL default '0',
   `alias` varchar(32) NOT NULL,
   `company` varchar(32) default NULL,
   `lastname` varchar(32) NOT NULL,
@@ -45,7 +46,8 @@ CREATE TABLE `PREFIX_address` (
   KEY `id_country` (`id_country`),
   KEY `id_state` (`id_state`),
   KEY `id_manufacturer` (`id_manufacturer`),
-  KEY `id_supplier` (`id_supplier`)
+  KEY `id_supplier` (`id_supplier`),
+  KEY `id_warehouse` (`id_warehouse`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_alias` (
@@ -139,6 +141,11 @@ CREATE TABLE `PREFIX_carrier` (
   `external_module_name` varchar(64) DEFAULT NULL,
   `shipping_method` int(2) NOT NULL DEFAULT '0',
   `position` int(10) unsigned NOT NULL default '0',
+  `max_width` int(10) DEFAULT 0,
+  `max_height` int(10)  DEFAULT 0,
+  `max_depth` int(10)  DEFAULT 0,
+  `max_weight` int(10)  DEFAULT 0,
+  `grade` int(10)  DEFAULT 0,
   PRIMARY KEY (`id_carrier`),
   KEY `deleted` (`deleted`,`active`),
   KEY `id_tax_rules_group` (`id_tax_rules_group`)
@@ -148,8 +155,8 @@ CREATE TABLE `PREFIX_carrier_lang` (
   `id_carrier` int(10) unsigned NOT NULL,
   `id_shop` int(11) unsigned NOT NULL DEFAULT '1',
   `id_lang` int(10) unsigned NOT NULL,
-  `delay` varchar(128) default NULL,
+  `delay` varchar(128) DEFAULT NULL,
-  UNIQUE KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`)
+  PRIMARY KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_carrier_zone` (
@@ -163,6 +170,7 @@ CREATE TABLE `PREFIX_cart` (
   `id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
   `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
   `id_carrier` int(10) unsigned NOT NULL,
+  `delivery_option` varchar(100),
   `id_lang` int(10) unsigned NOT NULL,
   `id_address_delivery` int(10) unsigned NOT NULL,
   `id_address_invoice` int(10) unsigned NOT NULL,
@@ -173,6 +181,7 @@ CREATE TABLE `PREFIX_cart` (
   `recyclable` tinyint(1) unsigned NOT NULL default '1',
   `gift` tinyint(1) unsigned NOT NULL default '0',
   `gift_message` text,
+  `allow_seperated_package` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
   PRIMARY KEY  (`id_cart`),
@@ -207,7 +216,7 @@ CREATE TABLE `PREFIX_cart_rule` (
 	`cart_rule_restriction` tinyint(1) unsigned NOT NULL default 0,
 	`product_restriction` tinyint(1) unsigned NOT NULL default 0,
 	`free_shipping` tinyint(1) NOT NULL default 0,
-	`reduction_percent` decimal(4,2) NOT NULL default 0,
+	`reduction_percent` decimal(5,2) NOT NULL default 0,
 	`reduction_amount` decimal(17,2) NOT NULL default 0,
 	`reduction_tax` tinyint(1) unsigned NOT NULL default 0,
 	`reduction_currency` int(10) unsigned NOT NULL default 0,
@@ -274,6 +283,7 @@ CREATE TABLE `PREFIX_cart_cart_rule` (
 CREATE TABLE `PREFIX_cart_product` (
   `id_cart` int(10) unsigned NOT NULL,
   `id_product` int(10) unsigned NOT NULL,
+  `id_address_delivery` int(10) UNSIGNED DEFAULT 0,
   `id_shop` int(10) unsigned NOT NULL DEFAULT '1',
   `id_product_attribute` int(10) unsigned default NULL,
   `quantity` int(10) unsigned NOT NULL default '0',
@@ -323,7 +333,7 @@ CREATE TABLE `PREFIX_category_product` (
   `id_category` int(10) unsigned NOT NULL,
   `id_product` int(10) unsigned NOT NULL,
   `position` int(10) unsigned NOT NULL default '0',
-  KEY `category_product_index` (`id_category`,`id_product`),
+  UNIQUE KEY `category_product_index` (`id_category`,`id_product`),
   INDEX (`id_product`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -372,14 +382,18 @@ CREATE TABLE `PREFIX_cms_category_lang` (
   KEY `category_name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_compare_product` (
+CREATE TABLE `PREFIX_compare` (
-  `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id_compare` int(10) unsigned NOT NULL auto_increment,
-  `id_product` int(10) unsigned NOT NULL,
-  `id_guest` int(10) unsigned NOT NULL,
   `id_customer` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id_compare`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_compare_product` (
+  `id_compare` int(10) unsigned NOT NULL,
+  `id_product` int(10) unsigned NOT NULL,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
-  PRIMARY KEY  (`id_compare_product`)
+  PRIMARY KEY (`id_compare`,`id_product`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_configuration` (
@@ -583,13 +597,14 @@ CREATE TABLE `PREFIX_customer_thread` (
 CREATE TABLE `PREFIX_customization` (
   `id_customization` int(10) unsigned NOT NULL auto_increment,
   `id_product_attribute` int(10) unsigned NOT NULL default '0',
+  `id_address_delivery` int(10) UNSIGNED NOT NULL DEFAULT 0,
   `id_cart` int(10) unsigned NOT NULL,
   `id_product` int(10) NOT NULL,
   `quantity` int(10) NOT NULL,
   `quantity_refunded` INT NOT NULL DEFAULT '0',
   `quantity_returned` INT NOT NULL DEFAULT '0',
   `in_cart` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  PRIMARY KEY  (`id_customization`,`id_cart`,`id_product`),
+  PRIMARY KEY  (`id_customization`,`id_cart`,`id_product`, `id_address_delivery`),
   KEY `id_product_attribute` (`id_product_attribute`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -656,7 +671,7 @@ CREATE TABLE `PREFIX_employee` (
   `bo_show_screencast` tinyint(1) NOT NULL default '1',
   `active` tinyint(1) unsigned NOT NULL default '0',
   `id_last_order` tinyint(1) unsigned NOT NULL default '0',
-  `id_last_message` tinyint(1) unsigned NOT NULL default '0',
+  `id_last_customer_message` tinyint(1) unsigned NOT NULL default '0',
   `id_last_customer` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id_employee`),
   KEY `employee_login` (`email`,`passwd`),
@@ -725,6 +740,7 @@ CREATE TABLE `PREFIX_group` (
   `id_group` int(10) unsigned NOT NULL auto_increment,
   `reduction` decimal(17,2) NOT NULL default '0.00',
   `price_display_method` TINYINT NOT NULL DEFAULT 0,
+  `show_prices` tinyint(1) unsigned NOT NULL DEFAULT '1',
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
   PRIMARY KEY  (`id_group`)
@@ -753,6 +769,13 @@ CREATE TABLE `PREFIX_product_group_reduction_cache` (
 	PRIMARY KEY(`id_product`, `id_group`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
+CREATE TABLE `PREFIX_product_carrier` (
+  `id_product` int(10) unsigned NOT NULL,
+  `id_carrier_reference` int(10) unsigned NOT NULL,
+  `id_shop` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id_product`, `id_carrier_reference`, `id_shop`)
+) ENGINE = ENGINE_TYPE DEFAULT CHARSET=utf8;
+
 CREATE TABLE `PREFIX_guest` (
   `id_guest` int(10) unsigned NOT NULL auto_increment,
   `id_operating_system` int(10) unsigned default NULL,
@@ -929,6 +952,7 @@ CREATE TABLE `PREFIX_module` (
   `id_module` int(10) unsigned NOT NULL auto_increment,
   `name` varchar(64) NOT NULL,
   `active` tinyint(1) unsigned NOT NULL default '0',
+  `version` VARCHAR(8) NOT NULL,
   PRIMARY KEY  (`id_module`),
   KEY `name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -971,6 +995,7 @@ CREATE TABLE `PREFIX_operating_system` (
 
 CREATE TABLE `PREFIX_orders` (
   `id_order` int(10) unsigned NOT NULL auto_increment,
+  `reference` VARCHAR(9),
   `id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
   `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
   `id_carrier` int(10) unsigned NOT NULL,
@@ -1025,14 +1050,38 @@ CREATE TABLE `PREFIX_orders` (
   INDEX `date_add`(`date_add`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `PREFIX_order_detail_tax` (
+CREATE TABLE `PREFIX_order_detail_tax` (
   `id_order_detail` int(11) NOT NULL,
-  `id_tax` int(11) NOT NULL
+  `id_tax` int(11) NOT NULL,
+  `unit_amount` DECIMAL( 10,6 ) NOT NULL default '0.00',
+  `total_amount` DECIMAL( 10, 6 ) NOT NULL default '0.00'
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_order_invoice` (
+  `id_order_invoice` int(11) NOT NULL AUTO_INCREMENT,
+  `id_order` int(11) NOT NULL,
+  `number` int(11) NOT NULL,
+  `total_discount_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_discount_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_paid_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_paid_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_products` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_products_wt` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_shipping_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_shipping_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_wrapping_tax_excl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `total_wrapping_tax_incl` decimal(17,2) NOT NULL DEFAULT '0.00',
+  `note` text,
+  `date_add` datetime NOT NULL,
+  PRIMARY KEY (`id_order_invoice`),
+  KEY `id_order` (`id_order`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_order_detail` (
   `id_order_detail` int(10) unsigned NOT NULL auto_increment,
   `id_order` int(10) unsigned NOT NULL,
+  `id_order_invoice` int(11) default NULL,
+  `id_warehouse` int(10) unsigned DEFAULT 0,
   `product_id` int(10) unsigned NOT NULL,
   `product_attribute_id` int(10) unsigned default NULL,
   `product_name` varchar(255) NOT NULL,
@@ -1044,6 +1093,8 @@ CREATE TABLE `PREFIX_order_detail` (
   `product_price` decimal(20,6) NOT NULL default '0.000000',
   `reduction_percent` DECIMAL(10, 2) NOT NULL default '0.00',
   `reduction_amount` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `reduction_amount_tax_incl` FLOAT( 20.6 ) NOT NULL default '0.000000',
+  `reduction_amount_tax_excl` FLOAT( 20.6 ) NOT NULL default '0.000000',
   `group_reduction` DECIMAL(10, 2) NOT NULL default '0.000000',
   `product_quantity_discount` decimal(20,6) NOT NULL default '0.000000',
   `product_ean13` varchar(13) default NULL,
@@ -1051,15 +1102,23 @@ CREATE TABLE `PREFIX_order_detail` (
   `product_reference` varchar(32) default NULL,
   `product_supplier_reference` varchar(32) default NULL,
   `product_weight` float NOT NULL,
+  `tax_computation_method` tinyint(1) unsigned NOT NULL default '0',
   `tax_name` varchar(16) NOT NULL,
   `tax_rate` DECIMAL(10,3) NOT NULL DEFAULT '0.000',
-  `tax_computation_method` tinyint(1) unsigned NOT NULL default '0',
   `ecotax` decimal(21,6) NOT NULL default '0.00',
   `ecotax_tax_rate` DECIMAL(5,3) NOT NULL DEFAULT '0.000',
   `discount_quantity_applied` TINYINT(1) NOT NULL DEFAULT 0,
   `download_hash` varchar(255) default NULL,
   `download_nb` int(10) unsigned default '0',
   `download_deadline` datetime default '0000-00-00 00:00:00',
+  `total_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `total_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `unit_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `unit_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `total_shipping_price_tax_incl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `total_shipping_price_tax_excl` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `purchase_supplier_price` DECIMAL(20, 6) NOT NULL default '0.000000',
+  `original_product_price` DECIMAL(20, 6) NOT NULL default '0.000000',
   PRIMARY KEY  (`id_order_detail`),
   KEY `order_detail_order` (`id_order`),
   KEY `product_id` (`product_id`),
@@ -1067,12 +1126,21 @@ CREATE TABLE `PREFIX_order_detail` (
   KEY `id_order_id_order_detail` (`id_order`, `id_order_detail`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
+  `id_order` int(11) NOT NULL,
+  `tax_name` varchar(40) NOT NULL,
+  `tax_rate` decimal(6,3) NOT NULL,
+  `amount` decimal(20,6) NOT NULL
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
 CREATE TABLE `PREFIX_order_cart_rule` (
   `id_order_cart_rule` int(10) unsigned NOT NULL auto_increment,
   `id_order` int(10) unsigned NOT NULL,
   `id_cart_rule` int(10) unsigned NOT NULL,
+  `id_order_invoice` int(10) unsigned DEFAULT 0,
   `name` varchar(32) NOT NULL,
   `value` decimal(17,2) NOT NULL default '0.00',
+  `value_tax_excl` decimal(17,2) NOT NULL default '0.00',
   PRIMARY KEY (`id_order_cart_rule`),
   KEY `id_order` (`id_order`),
   KEY `id_cart_rule` (`id_cart_rule`)
@@ -1144,6 +1212,9 @@ CREATE TABLE `PREFIX_order_slip` (
   `id_customer` int(10) unsigned NOT NULL,
   `id_order` int(10) unsigned NOT NULL,
   `shipping_cost` tinyint(3) unsigned NOT NULL default '0',
+  `amount` DECIMAL(10,2) NOT NULL,
+  `shipping_cost_amount` DECIMAL(10,2) NOT NULL,
+  `partial` TINYINT(1) NOT NULL,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
   PRIMARY KEY  (`id_order_slip`),
@@ -1155,6 +1226,7 @@ CREATE TABLE `PREFIX_order_slip_detail` (
   `id_order_slip` int(10) unsigned NOT NULL,
   `id_order_detail` int(10) unsigned NOT NULL,
   `product_quantity` int(10) unsigned NOT NULL default '0',
+  `amount` DECIMAL(10,2) NOT NULL,
   PRIMARY KEY  (`id_order_slip`,`id_order_detail`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -1168,6 +1240,7 @@ CREATE TABLE `PREFIX_order_state` (
   `logable` tinyint(1) NOT NULL default '0',
   `delivery` tinyint(1) UNSIGNED NOT NULL default '0',
   `shipped` tinyint(1) UNSIGNED NOT NULL default '0',
+  `paid` tinyint(1) UNSIGNED NOT NULL default '0',
   PRIMARY KEY  (`id_order_state`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -1211,18 +1284,21 @@ CREATE TABLE `PREFIX_page_viewed` (
   PRIMARY KEY  (`id_page`, `id_date_range`, `id_shop`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_payment_cc` (
+CREATE TABLE `PREFIX_order_payment` (
-	`id_payment_cc` INT NOT NULL auto_increment,
+	`id_order_payment` INT NOT NULL auto_increment,
+	`id_order_invoice` INT UNSIGNED NULL,
 	`id_order` INT UNSIGNED NULL,
 	`id_currency` INT UNSIGNED NOT NULL,
 	`amount` DECIMAL(10,2) NOT NULL,
+	`payment_method` varchar(255) NOT NULL,
+	`conversion_rate` decimal(13,6) NOT NULL DEFAULT 1,
 	`transaction_id` VARCHAR(254) NULL,
 	`card_number` VARCHAR(254) NULL,
 	`card_brand` VARCHAR(254) NULL,
 	`card_expiration` CHAR(7) NULL,
 	`card_holder` VARCHAR(254) NULL,
 	`date_add` DATETIME NOT NULL,
-	PRIMARY KEY (`id_payment_cc`),
+	PRIMARY KEY (`id_order_payment`),
 	KEY `id_order` (`id_order`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -1268,6 +1344,7 @@ CREATE TABLE `PREFIX_product` (
   `cache_default_attribute` int(10) unsigned default NULL,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
+  `advanced_stock_management` tinyint(1) default '0' NOT NULL,
   PRIMARY KEY  (`id_product`),
   KEY `product_supplier` (`id_supplier`),
   KEY `product_manufacturer` (`id_manufacturer`),
@@ -1508,20 +1585,26 @@ CREATE TABLE `PREFIX_search_word` (
 
 CREATE TABLE `PREFIX_specific_price` (
 	`id_specific_price` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+	`id_specific_price_rule` INT(11) UNSIGNED NOT NULL,
+	`id_cart` INT(11) UNSIGNED NOT NULL,
 	`id_product` INT UNSIGNED NOT NULL,
 	`id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
+	`id_group_shop` INT(11) UNSIGNED NOT NULL,
 	`id_currency` INT UNSIGNED NOT NULL,
 	`id_country` INT UNSIGNED NOT NULL,
 	`id_group` INT UNSIGNED NOT NULL,
+	`id_customer` INT UNSIGNED NOT NULL,
 	`id_product_attribute` INT UNSIGNED NOT NULL,
 	`price` DECIMAL(20, 6) NOT NULL,
-	`from_quantity` SMALLINT UNSIGNED NOT NULL,
+	`from_quantity` mediumint(8) UNSIGNED NOT NULL,
 	`reduction` DECIMAL(20, 6) NOT NULL,
 	`reduction_type` ENUM('amount', 'percentage') NOT NULL,
 	`from` DATETIME NOT NULL,
 	`to` DATETIME NOT NULL,
 	PRIMARY KEY(`id_specific_price`),
-	KEY (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `from_quantity`, `from`, `to`)
+	KEY (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `id_customer`, `from_quantity`, `from`, `to`),
+	KEY (`id_specific_price_rule`),
+	KEY (`id_cart`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_state` (
@@ -1545,6 +1628,7 @@ CREATE TABLE `PREFIX_subdomain` (
 
 CREATE TABLE `PREFIX_supplier` (
   `id_supplier` int(10) unsigned NOT NULL auto_increment,
+  `id_address` int(10) unsigned NOT NULL default 0,
   `name` varchar(64) NOT NULL,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
@@ -1594,6 +1678,7 @@ CREATE TABLE `PREFIX_tax` (
   `rate` DECIMAL(10, 3) NOT NULL,
   `active` tinyint(1) unsigned NOT NULL default '1',
   `deleted` tinyint(1) unsigned NOT NULL default '0',
+  `account_number` varchar(64) NOT NULL,
   PRIMARY KEY  (`id_tax`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -1638,8 +1723,8 @@ CREATE TABLE `PREFIX_store` (
   `address2` varchar(128) DEFAULT NULL,
   `city` varchar(64) NOT NULL,
   `postcode` varchar(12) NOT NULL,
-  `latitude` decimal(10,8) DEFAULT NULL,
+  `latitude` decimal(11,8) DEFAULT NULL,
-  `longitude` decimal(10,8) DEFAULT NULL,
+  `longitude` decimal(11,8) DEFAULT NULL,
   `hours` varchar(254) DEFAULT NULL,
   `phone` varchar(16) DEFAULT NULL,
   `fax` varchar(16) DEFAULT NULL,
@@ -1731,7 +1816,8 @@ CREATE TABLE `PREFIX_specific_price_priority` (
 	`id_specific_price_priority` INT NOT NULL AUTO_INCREMENT ,
 	`id_product` INT NOT NULL ,
 	`priority` VARCHAR( 80 ) NOT NULL ,
-	PRIMARY KEY ( `id_specific_price_priority` , `id_product` )
+	PRIMARY KEY ( `id_specific_price_priority` , `id_product` ),
+	UNIQUE KEY `id_product` (`id_product`)
 )  ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_log` (
@@ -1754,12 +1840,6 @@ CREATE TABLE `PREFIX_import_match` (
   PRIMARY KEY (`id_import_match`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_address_format` (
-  `id_country` int(10) unsigned NOT NULL,
-  `format` varchar(255) NOT NULL DEFAULT '',
-  KEY `country` (`id_country`)
-) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `PREFIX_group_shop` (
   `id_group_shop` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(64) CHARACTER SET utf8 NOT NULL,
@@ -1788,15 +1868,16 @@ CREATE TABLE IF NOT EXISTS `PREFIX_shop` (
 CREATE TABLE IF NOT EXISTS `PREFIX_shop_url` (
   `id_shop_url` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `id_shop` int(11) unsigned NOT NULL,
-	  `domain` varchar(255) NOT NULL,
+  `domain` varchar(150) NOT NULL,
-	  `domain_ssl` varchar(255) NOT NULL,
+  `domain_ssl` varchar(150) NOT NULL,
   `physical_uri` varchar(64) NOT NULL,
   `virtual_uri` varchar(64) NOT NULL,
   `main` TINYINT(1) NOT NULL,
   `active` TINYINT(1) NOT NULL,
   PRIMARY KEY (`id_shop_url`),
   KEY `id_shop` (`id_shop`),
-	  UNIQUE KEY `shop_url` (`domain`, `virtual_uri`)
+  UNIQUE KEY `full_shop_url` (`domain`, `physical_uri`, `virtual_uri`),
+  UNIQUE KEY `full_shop_url_ssl` (`domain_ssl`, `physical_uri`, `virtual_uri`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `PREFIX_theme` (
@@ -1827,6 +1908,12 @@ PRIMARY KEY (`id_carrier`, `id_shop`),
   KEY `id_shop` (`id_shop`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
+CREATE TABLE `PREFIX_address_format` (
+  `id_country` int(10) unsigned NOT NULL,
+  `format` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_country`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
 CREATE TABLE `PREFIX_cms_shop` (
 `id_cms` INT( 11 ) UNSIGNED NOT NULL,
 `id_shop` INT( 11 ) UNSIGNED NOT NULL ,
@@ -1957,9 +2044,11 @@ CREATE TABLE `PREFIX_stock_mvt` (
   `id_stock_mvt` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `id_stock` INT(11) UNSIGNED NOT NULL,
   `id_order` INT(11) UNSIGNED DEFAULT NULL,
-  `id_supplier_order` INT(11) UNSIGNED DEFAULT NULL,
+  `id_supply_order` INT(11) UNSIGNED DEFAULT NULL,
   `id_stock_mvt_reason` INT(11) UNSIGNED NOT NULL,
   `id_employee` INT(11) UNSIGNED NOT NULL,
+  `employee_lastname` varchar(32) DEFAULT '',
+  `employee_firstname` varchar(32) DEFAULT '',
   `physical_quantity` INT(11) UNSIGNED NOT NULL,
   `date_add` DATETIME NOT NULL,
   `sign` tinyint(1) NOT NULL DEFAULT 1,
@@ -1977,6 +2066,7 @@ CREATE TABLE `PREFIX_stock_mvt_reason` (
   `sign` tinyint(1) NOT NULL DEFAULT 1,
   `date_add` datetime NOT NULL,
   `date_upd` datetime NOT NULL,
+  `deleted` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY (`id_stock_mvt_reason`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
@@ -1992,6 +2082,9 @@ CREATE TABLE `PREFIX_stock` (
 `id_warehouse` INT(11) UNSIGNED NOT NULL,
 `id_product` INT(11) UNSIGNED NOT NULL,
 `id_product_attribute` INT(11) UNSIGNED NOT NULL,
+`reference`  VARCHAR(32) NOT NULL,
+`ean13`  VARCHAR(13) DEFAULT NULL,
+`upc`  VARCHAR(12) DEFAULT NULL,
 `physical_quantity` INT(11) UNSIGNED NOT NULL,
 `usable_quantity` INT(11) UNSIGNED NOT NULL,
 `price_te` DECIMAL(20,6) DEFAULT '0.000000',
@@ -2009,18 +2102,18 @@ CREATE TABLE `PREFIX_warehouse` (
 `reference` VARCHAR(32) DEFAULT NULL,
 `name` VARCHAR(45) NOT NULL,
 `management_type` ENUM('WA', 'FIFO', 'LIFO') NOT NULL DEFAULT 'WA',
+`deleted` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY (`id_warehouse`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_warehouse_product_location` (
-`id_product` INT(11) UNSIGNED NOT NULL,
+  `id_warehouse_product_location` int(11) unsigned NOT NULL AUTO_INCREMENT,
-`id_product_attribute` INT(11) UNSIGNED NOT NULL,
+  `id_product` int(11) unsigned NOT NULL,
-`id_warehouse` INT(11) UNSIGNED NOT NULL,
+  `id_product_attribute` int(11) unsigned NOT NULL,
-`location` VARCHAR(64) DEFAULT NULL,
+  `id_warehouse` int(11) unsigned NOT NULL,
-  PRIMARY KEY (`id_product`, `id_product_attribute`, `id_warehouse`),
+  `location` varchar(64) DEFAULT NULL,
-  KEY `id_warehouse` (`id_warehouse`),
+  PRIMARY KEY (`id_warehouse_product_location`),
-  KEY `id_product` (`id_product`),
+  UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_warehouse`)
-  KEY `id_product_attribute` (`id_product_attribute`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_warehouse_shop` (
@@ -2044,24 +2137,27 @@ CREATE TABLE `PREFIX_stock_available` (
 `id_product` INT(11) UNSIGNED NOT NULL,
 `id_product_attribute` INT(11) UNSIGNED NOT NULL,
 `id_shop` INT(11) UNSIGNED NOT NULL,
+`id_group_shop` INT(11) UNSIGNED NOT NULL,
 `quantity` INT(10) NOT NULL DEFAULT '0',
 `depends_on_stock` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
 `out_of_stock` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`id_stock_available`),
   KEY `id_shop` (`id_shop`),
+  KEY `id_group_shop` (`id_group_shop`),
   KEY `id_product` (`id_product`),
   KEY `id_product_attribute` (`id_product_attribute`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order` (
+CREATE TABLE `PREFIX_supply_order` (
-`id_supplier_order` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`id_supply_order` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 `id_supplier` INT(11) UNSIGNED NOT NULL,
-`id_employee` INT(11) UNSIGNED NOT NULL,
+`supplier_name` VARCHAR(64) NOT NULL,
+`id_lang` INT(11) UNSIGNED NOT NULL,
 `id_warehouse` INT(11) UNSIGNED NOT NULL,
-`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
+`id_supply_order_state` INT(11) UNSIGNED NOT NULL,
 `id_currency` INT(11) UNSIGNED NOT NULL,
 `id_ref_currency` INT(11) UNSIGNED NOT NULL,
-`reference` VARCHAR(32) DEFAULT NULL,
+`reference` VARCHAR(32) NOT NULL,
 `date_add` DATETIME NOT NULL,
 `date_upd` DATETIME NOT NULL,
 `date_delivery_expected` DATETIME DEFAULT NULL,
@@ -2071,18 +2167,24 @@ CREATE TABLE `PREFIX_supplier_order` (
 `total_ti` DECIMAL(20,6) DEFAULT '0.000000',
 `discount_rate` DECIMAL(20,6) DEFAULT '0.000000',
 `discount_value_te` DECIMAL(20,6) DEFAULT '0.000000',
-  PRIMARY KEY (`id_supplier_order`),
+`is_template` tinyint(1) DEFAULT '0',
+  PRIMARY KEY (`id_supply_order`),
   KEY `id_supplier` (`id_supplier`),
   KEY `id_warehouse` (`id_warehouse`),
   KEY `reference` (`reference`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order_detail` (
+CREATE TABLE `PREFIX_supply_order_detail` (
-`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`id_supply_order_detail` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`id_supplier_order` INT(11) UNSIGNED NOT NULL,
+`id_supply_order` INT(11) UNSIGNED NOT NULL,
+`id_currency` INT(11) UNSIGNED NOT NULL,
 `id_product` INT(11) UNSIGNED NOT NULL,
 `id_product_attribute` INT(11) UNSIGNED NOT NULL,
-`id_currency` INT(11) UNSIGNED NOT NULL,
+`reference`  VARCHAR(32) NOT NULL,
+`supplier_reference`  VARCHAR(32) NOT NULL,
+`name`  varchar(128) NOT NULL,
+`ean13`  VARCHAR(13) DEFAULT NULL,
+`upc`  VARCHAR(12) DEFAULT NULL,
 `exchange_rate` DECIMAL(20,6) DEFAULT '0.000000',
 `unit_price_te` DECIMAL(20,6) DEFAULT '0.000000',
 `quantity_expected` INT(11) UNSIGNED NOT NULL,
@@ -2096,64 +2198,78 @@ CREATE TABLE `PREFIX_supplier_order_detail` (
 `price_ti` DECIMAL(20,6) DEFAULT '0.000000',
 `tax_value_with_order_discount` DECIMAL(20,6) DEFAULT '0.000000',
 `price_with_order_discount_te` DECIMAL(20,6) DEFAULT '0.000000',
-  PRIMARY KEY (`id_supplier_order_detail`),
+  PRIMARY KEY (`id_supply_order_detail`),
-  KEY `id_supplier_order` (`id_supplier_order`),
+  KEY `id_supply_order` (`id_supply_order`),
   KEY `id_product` (`id_product`),
   KEY `id_product_attribute` (`id_product_attribute`),
   KEY `id_product_product_attribute` (`id_product`, `id_product_attribute`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order_history` (
+CREATE TABLE `PREFIX_supply_order_history` (
-`id_supplier_order_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`id_supply_order_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`id_supplier_order` INT(11) UNSIGNED NOT NULL,
+`id_supply_order` INT(11) UNSIGNED NOT NULL,
 `id_employee` INT(11) UNSIGNED NOT NULL,
+`employee_lastname` varchar(32) DEFAULT '',
+`employee_firstname` varchar(32) DEFAULT '',
 `id_state` INT(11) UNSIGNED NOT NULL,
 `date_add` DATETIME NOT NULL,
-  PRIMARY KEY (`id_supplier_order_history`),
+  PRIMARY KEY (`id_supply_order_history`),
-  KEY `id_supplier_order` (`id_supplier_order`),
+  KEY `id_supply_order` (`id_supply_order`),
   KEY `id_employee` (`id_employee`),
   KEY `id_state` (`id_state`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order_state` (
+CREATE TABLE `PREFIX_supply_order_state` (
-`id_supplier_order_state` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`id_supply_order_state` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 `delivery_note` tinyint(1) NOT NULL DEFAULT 0,
 `editable` tinyint(1) NOT NULL DEFAULT 0,
 `receipt_state` tinyint(1) NOT NULL DEFAULT 0,
 `pending_receipt` tinyint(1) NOT NULL DEFAULT 0,
 `enclosed` tinyint(1) NOT NULL DEFAULT 0,
 `color` VARCHAR(32) DEFAULT NULL,
-  PRIMARY KEY (`id_supplier_order_state`)
+  PRIMARY KEY (`id_supply_order_state`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order_state_lang` (
+CREATE TABLE `PREFIX_supply_order_state_lang` (
-`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
+`id_supply_order_state` INT(11) UNSIGNED NOT NULL,
 `id_lang` INT(11) UNSIGNED NOT NULL,
 `name` VARCHAR(128) DEFAULT NULL,
-  PRIMARY KEY (`id_supplier_order_state`, `id_lang`)
+  PRIMARY KEY (`id_supply_order_state`, `id_lang`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
-CREATE TABLE `PREFIX_supplier_order_receipt_history` (
+CREATE TABLE `PREFIX_supply_order_receipt_history` (
-`id_supplier_order_receipt_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`id_supply_order_receipt_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL,
+`id_supply_order_detail` INT(11) UNSIGNED NOT NULL,
 `id_employee` INT(11) UNSIGNED NOT NULL,
-`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
+`employee_lastname` varchar(32) DEFAULT '',
+`employee_firstname` varchar(32) DEFAULT '',
+`id_supply_order_state` INT(11) UNSIGNED NOT NULL,
 `quantity` INT(11) UNSIGNED NOT NULL,
 `date_add` DATETIME NOT NULL,
-  PRIMARY KEY (`id_supplier_order_receipt_history`),
+  PRIMARY KEY (`id_supply_order_receipt_history`),
-  KEY `id_supplier_order_detail` (`id_supplier_order_detail`),
+  KEY `id_supply_order_detail` (`id_supply_order_detail`),
-  KEY `id_supplier_order_state` (`id_supplier_order_state`)
+  KEY `id_supply_order_state` (`id_supply_order_state`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_product_supplier` (
+  `id_product_supplier` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `id_product` int(11) UNSIGNED NOT NULL,
+  `id_product_attribute` int(11) UNSIGNED NOT NULL DEFAULT '0',
+  `id_supplier` int(11) UNSIGNED NOT NULL,
+  `product_supplier_reference` varchar(32) DEFAULT NULL,
+  `product_supplier_price_te` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `id_currency` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`id_product_supplier`),
+  UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_supplier`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_supplier_rates` (
-`id_product` INT(11) UNSIGNED NOT NULL,
+`id_product_supplier` INT(11) UNSIGNED NOT NULL,
-`id_product_attribute` INT(11) UNSIGNED NOT NULL,
-`id_supplier` INT(11) UNSIGNED NOT NULL,
 `id_currency` INT(11) UNSIGNED NOT NULL,
 `quantity_min` INT(11) UNSIGNED NOT NULL,
 `quantity_max` INT(11) UNSIGNED NOT NULL,
 `price_te` DECIMAL(20,6) DEFAULT '0.000000',
-  PRIMARY KEY (`id_product`, `id_product_attribute`, `id_supplier`, `quantity_min`, `quantity_max`)
+  PRIMARY KEY (`id_product_supplier`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_accounting_zone_shop` (
@@ -2164,3 +2280,61 @@ CREATE TABLE `PREFIX_accounting_zone_shop` (
   PRIMARY KEY (`id_accounting_zone_shop`),
   UNIQUE KEY `id_zone` (`id_zone`,`id_shop`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_accounting_product_zone_shop` (
+  `id_accounting_product_zone_shop` int(11) NOT NULL AUTO_INCREMENT,
+  `id_product` int(11) NOT NULL,
+  `id_shop` int(11) NOT NULL,
+  `id_zone` int(11) NOT NULL,
+  `account_number` varchar(64) NOT NULL,
+  PRIMARY KEY (`id_accounting_product_zone_shop`),
+  UNIQUE KEY `id_product` (`id_product`,`id_shop`,`id_zone`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_order_carrier` (
+  `id_order_carrier` int(11) NOT NULL AUTO_INCREMENT,
+  `id_order` int(11) unsigned NOT NULL,
+  `id_carrier` int(11) unsigned NOT NULL,
+  `id_order_invoice` int(11) unsigned DEFAULT NULL,
+  `weight` float DEFAULT NULL,
+  `shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL,
+  `shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL,
+  `tracking_number` varchar(64) DEFAULT NULL,
+  `date_add` datetime NOT NULL,
+  PRIMARY KEY (`id_order_carrier`),
+  KEY `id_order` (`id_order`),
+  KEY `id_carrier` (`id_carrier`),
+  KEY `id_order_invoice` (`id_order_invoice`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
+	`id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	`name` VARCHAR(255) NOT NULL,
+	`id_shop` int(11) unsigned NOT NULL DEFAULT '1',
+	`id_currency` int(10) unsigned NOT NULL,
+	`id_country` int(10) unsigned NOT NULL,
+	`id_group` int(10) unsigned NOT NULL,
+	`from_quantity` mediumint(8) unsigned NOT NULL,
+	`price` DECIMAL(20,6),
+	`reduction` decimal(20,6) NOT NULL,
+	`reduction_type` enum('amount','percentage') NOT NULL,
+	`from` datetime NOT NULL,
+	`to` datetime NOT NULL,
+	PRIMARY KEY (`id_specific_price_rule`),
+	KEY `id_product` (`id_shop`,`id_currency`,`id_country`,`id_group`,`from_quantity`,`from`,`to`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_specific_price_rule_condition_group` (
+	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule` INT(11) UNSIGNED NOT NULL,
+	PRIMARY KEY ( `id_specific_price_rule_condition_group`, `id_specific_price_rule` )
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_specific_price_rule_condition` (
+	`id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
+	`type` VARCHAR(255) NOT NULL,
+	`value` VARCHAR(255) NOT NULL,
+PRIMARY KEY (`id_specific_price_rule_condition`),
+INDEX (`id_specific_price_rule_condition_group`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;

install-new/data/xml/.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity_>
-	<fields id="name" primary="" class="Zone" sql="">
-		<field name="name" />
-	</fields>
-
-	<entities>
-	</entities>
-</entity_>

install-new/data/xml/access.xml

@@ -8,7 +8,6 @@
     <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"/>
@@ -57,7 +56,6 @@
     <access id="access_1_47" id_profile="SuperAdmin" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_48" id_profile="SuperAdmin" id_tab="PDF" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_49" id_profile="SuperAdmin" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_1_51" id_profile="SuperAdmin" id_tab="Settings" view="1" add="1" edit="1" delete="1" />
     <access id="access_1_52" id_profile="SuperAdmin" id_tab="Subdomains" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_53" id_profile="SuperAdmin" id_tab="DB_Backup" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_54" id_profile="SuperAdmin" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
@@ -100,10 +98,15 @@
     <access id="access_1_97" id_profile="SuperAdmin" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_98" id_profile="SuperAdmin" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_99" id_profile="SuperAdmin" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_1_100" id_profile="SuperAdmin" id_tab="Supplier_orders" view="1" add="1" edit="1" delete="1" />
+    <access id="access_1_100" id_profile="SuperAdmin" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_101" id_profile="SuperAdmin" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_102" id_profile="SuperAdmin" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_103" id_profile="SuperAdmin" id_tab="Account_Number_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_104" id_profile="SuperAdmin" id_tab="Export" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_105" id_profile="SuperAdmin" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_106" id_profile="SuperAdmin" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_107" id_profile="SuperAdmin" id_tab="tab_107" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_108" id_profile="SuperAdmin" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_109" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
   </entities>
 </entity_access>

install-new/data/xml/carrier.xml

@@ -12,12 +12,16 @@
     <field name="shipping_external"/>
     <field name="need_range"/>
     <field name="shipping_method"/>
+    <field name="max_width"/>
+    <field name="max_height"/>
+    <field name="max_depth"/>
+    <field name="max_weight"/>
+    <field name="grade"/>
   </fields>
-
   <entities>
-		<carrier id="0" 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">
+    <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><![CDATA[0]]></name>
+      <name>0</name>
-			<url><![CDATA[]]></url>
+      <url/>
     </carrier>
   </entities>
 </entity_carrier>

install-new/data/xml/carrier_group.xml

@@ -4,8 +4,5 @@
     <field name="id_carrier" relation="carrier"/>
     <field name="id_group" relation="group"/>
   </fields>
-
+  <entities/>
-	<entities>
-		<carrier_group id="carrier_group_1_1" id_carrier="0" id_group="Default" />
-	</entities>
 </entity_carrier_group>

install-new/data/xml/carrier_zone.xml

@@ -4,8 +4,7 @@
     <field name="id_carrier" relation="carrier"/>
     <field name="id_zone" relation="zone"/>
   </fields>
-
   <entities>
-		<carrier_zone id="carrier_zone_1_1" id_carrier="0" id_zone="Europe" />
+    <carrier_zone id="carrier_zone_1_1" id_carrier="carrier_1" id_zone="Europe"/>
   </entities>
 </entity_carrier_zone>

install-new/data/xml/category.xml

@@ -4,7 +4,6 @@
     <field name="id_parent" relation="category"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <category id="Home" id_parent="" active="1"/>
   </entities>

install-new/data/xml/cms.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/data/xml/cms_category.xml

@@ -4,7 +4,6 @@
     <field name="id_parent" relation="cms_category"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <cms_category id="Home" id_parent="" active="1"/>
   </entities>

install-new/data/xml/contact.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_contact>
   <fields id="name" class="Contact">
-		<field name="email" />
     <field name="customer_service"/>
   </fields>
-
   <entities>
-		<contact id="Webmaster" customer_service="1">
+    <contact id="Webmaster" customer_service="1"/>
-			<email><![CDATA[raphael.malie@gmail.com]]></email>
+    <contact id="Customer_service" customer_service="1"/>
-		</contact>
-		<contact id="Customer_service" customer_service="1">
-			<email><![CDATA[raphael.malie@gmail.com]]></email>
-		</contact>
   </entities>
 </entity_contact>

install-new/data/xml/country.xml

@@ -11,7 +11,6 @@
     <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"/>

install-new/data/xml/gender.xml

@@ -3,7 +3,6 @@
   <fields id="name" class="Gender" image="genders">
     <field name="type"/>
   </fields>
-
   <entities>
     <gender id="Mr" type="0"/>
     <gender id="Ms" type="1"/>

install-new/data/xml/group.xml

@@ -3,9 +3,11 @@
   <fields id="name" class="Group">
     <field name="reduction"/>
     <field name="price_display_method"/>
+    <field name="show_prices"/>
   </fields>
-
   <entities>
-		<group id="Default" reduction="0.00" price_display_method="0" />
+    <group id="Unidentified" 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="Default" reduction="0.00" price_display_method="0" show_prices="1"/>
   </entities>
 </entity_group>

install-new/data/xml/hook.xml

@@ -7,7 +7,5 @@
     <field name="live_edit"/>
     <field name="is_native"/>
   </fields>
-
+  <entities/>
-	<entities>
-	</entities>
 </entity_hook>

install-new/data/xml/hook_alias.xml

@@ -4,347 +4,346 @@
     <field name="alias"/>
     <field name="name"/>
   </fields>
-
   <entities>
     <hook_alias id="payment">
-			<alias><![CDATA[payment]]></alias>
+      <alias>payment</alias>
-			<name><![CDATA[displayPayment]]></name>
+      <name>displayPayment</name>
     </hook_alias>
     <hook_alias id="newOrder">
-			<alias><![CDATA[newOrder]]></alias>
+      <alias>newOrder</alias>
-			<name><![CDATA[actionValidateOrder]]></name>
+      <name>actionValidateOrder</name>
     </hook_alias>
     <hook_alias id="paymentConfirm">
-			<alias><![CDATA[paymentConfirm]]></alias>
+      <alias>paymentConfirm</alias>
-			<name><![CDATA[actionPaymentConfirmation]]></name>
+      <name>actionPaymentConfirmation</name>
     </hook_alias>
     <hook_alias id="paymentReturn">
-			<alias><![CDATA[paymentReturn]]></alias>
+      <alias>paymentReturn</alias>
-			<name><![CDATA[displayPaymentReturn]]></name>
+      <name>displayPaymentReturn</name>
     </hook_alias>
     <hook_alias id="updateQuantity">
-			<alias><![CDATA[updateQuantity]]></alias>
+      <alias>updateQuantity</alias>
-			<name><![CDATA[actionUpdateQuantity]]></name>
+      <name>actionUpdateQuantity</name>
     </hook_alias>
     <hook_alias id="rightColumn">
-			<alias><![CDATA[rightColumn]]></alias>
+      <alias>rightColumn</alias>
-			<name><![CDATA[displayRightColumn]]></name>
+      <name>displayRightColumn</name>
     </hook_alias>
     <hook_alias id="leftColumn">
-			<alias><![CDATA[leftColumn]]></alias>
+      <alias>leftColumn</alias>
-			<name><![CDATA[displayLeftColumn]]></name>
+      <name>displayLeftColumn</name>
     </hook_alias>
     <hook_alias id="home">
-			<alias><![CDATA[home]]></alias>
+      <alias>home</alias>
-			<name><![CDATA[displayHome]]></name>
+      <name>displayHome</name>
     </hook_alias>
     <hook_alias id="header">
-			<alias><![CDATA[header]]></alias>
+      <alias>header</alias>
-			<name><![CDATA[displayHeader]]></name>
+      <name>displayHeader</name>
     </hook_alias>
     <hook_alias id="cart">
-			<alias><![CDATA[cart]]></alias>
+      <alias>cart</alias>
-			<name><![CDATA[actionCartSave]]></name>
+      <name>actionCartSave</name>
     </hook_alias>
     <hook_alias id="authentication">
-			<alias><![CDATA[authentication]]></alias>
+      <alias>authentication</alias>
-			<name><![CDATA[actionAuthentication]]></name>
+      <name>actionAuthentication</name>
     </hook_alias>
     <hook_alias id="addproduct">
-			<alias><![CDATA[addproduct]]></alias>
+      <alias>addproduct</alias>
-			<name><![CDATA[actionProductAdd]]></name>
+      <name>actionProductAdd</name>
     </hook_alias>
     <hook_alias id="updateproduct">
-			<alias><![CDATA[updateproduct]]></alias>
+      <alias>updateproduct</alias>
-			<name><![CDATA[actionProductUpdate]]></name>
+      <name>actionProductUpdate</name>
     </hook_alias>
     <hook_alias id="top">
-			<alias><![CDATA[top]]></alias>
+      <alias>top</alias>
-			<name><![CDATA[displayTop]]></name>
+      <name>displayTop</name>
     </hook_alias>
     <hook_alias id="extraRight">
-			<alias><![CDATA[extraRight]]></alias>
+      <alias>extraRight</alias>
-			<name><![CDATA[displayRightColumnProduct]]></name>
+      <name>displayRightColumnProduct</name>
     </hook_alias>
     <hook_alias id="deleteproduct">
-			<alias><![CDATA[deleteproduct]]></alias>
+      <alias>deleteproduct</alias>
-			<name><![CDATA[actionProductDelete]]></name>
+      <name>actionProductDelete</name>
     </hook_alias>
     <hook_alias id="productfooter">
-			<alias><![CDATA[productfooter]]></alias>
+      <alias>productfooter</alias>
-			<name><![CDATA[displayFooterProduct]]></name>
+      <name>displayFooterProduct</name>
     </hook_alias>
     <hook_alias id="invoice">
-			<alias><![CDATA[invoice]]></alias>
+      <alias>invoice</alias>
-			<name><![CDATA[displayInvoice]]></name>
+      <name>displayInvoice</name>
     </hook_alias>
     <hook_alias id="updateOrderStatus">
-			<alias><![CDATA[updateOrderStatus]]></alias>
+      <alias>updateOrderStatus</alias>
-			<name><![CDATA[actionOrderStatusUpdate]]></name>
+      <name>actionOrderStatusUpdate</name>
     </hook_alias>
     <hook_alias id="adminOrder">
-			<alias><![CDATA[adminOrder]]></alias>
+      <alias>adminOrder</alias>
-			<name><![CDATA[displayAdminOrder]]></name>
+      <name>displayAdminOrder</name>
     </hook_alias>
     <hook_alias id="footer">
-			<alias><![CDATA[footer]]></alias>
+      <alias>footer</alias>
-			<name><![CDATA[displayFooter]]></name>
+      <name>displayFooter</name>
     </hook_alias>
     <hook_alias id="PDFInvoice">
-			<alias><![CDATA[PDFInvoice]]></alias>
+      <alias>PDFInvoice</alias>
-			<name><![CDATA[displayPDFInvoice]]></name>
+      <name>displayPDFInvoice</name>
     </hook_alias>
     <hook_alias id="adminCustomers">
-			<alias><![CDATA[adminCustomers]]></alias>
+      <alias>adminCustomers</alias>
-			<name><![CDATA[displayAdminCustomers]]></name>
+      <name>displayAdminCustomers</name>
     </hook_alias>
     <hook_alias id="orderConfirmation">
-			<alias><![CDATA[orderConfirmation]]></alias>
+      <alias>orderConfirmation</alias>
-			<name><![CDATA[displayOrderConfirmation]]></name>
+      <name>displayOrderConfirmation</name>
     </hook_alias>
     <hook_alias id="createAccount">
-			<alias><![CDATA[createAccount]]></alias>
+      <alias>createAccount</alias>
-			<name><![CDATA[actionCustomerAccountAdd]]></name>
+      <name>actionCustomerAccountAdd</name>
     </hook_alias>
     <hook_alias id="customerAccount">
-			<alias><![CDATA[customerAccount]]></alias>
+      <alias>customerAccount</alias>
-			<name><![CDATA[displayCustomerAccount]]></name>
+      <name>displayCustomerAccount</name>
     </hook_alias>
     <hook_alias id="orderSlip">
-			<alias><![CDATA[orderSlip]]></alias>
+      <alias>orderSlip</alias>
-			<name><![CDATA[actionOrderSlipAdd]]></name>
+      <name>actionOrderSlipAdd</name>
     </hook_alias>
     <hook_alias id="productTab">
-			<alias><![CDATA[productTab]]></alias>
+      <alias>productTab</alias>
-			<name><![CDATA[displayProductTab]]></name>
+      <name>displayProductTab</name>
     </hook_alias>
     <hook_alias id="productTabContent">
-			<alias><![CDATA[productTabContent]]></alias>
+      <alias>productTabContent</alias>
-			<name><![CDATA[displayProductTabContent]]></name>
+      <name>displayProductTabContent</name>
     </hook_alias>
     <hook_alias id="shoppingCart">
-			<alias><![CDATA[shoppingCart]]></alias>
+      <alias>shoppingCart</alias>
-			<name><![CDATA[displayShoppingCartFooter]]></name>
+      <name>displayShoppingCartFooter</name>
     </hook_alias>
     <hook_alias id="createAccountForm">
-			<alias><![CDATA[createAccountForm]]></alias>
+      <alias>createAccountForm</alias>
-			<name><![CDATA[displayCustomerAccountForm]]></name>
+      <name>displayCustomerAccountForm</name>
     </hook_alias>
     <hook_alias id="AdminStatsModules">
-			<alias><![CDATA[AdminStatsModules]]></alias>
+      <alias>AdminStatsModules</alias>
-			<name><![CDATA[displayAdminStatsModules]]></name>
+      <name>displayAdminStatsModules</name>
     </hook_alias>
     <hook_alias id="GraphEngine">
-			<alias><![CDATA[GraphEngine]]></alias>
+      <alias>GraphEngine</alias>
-			<name><![CDATA[displayAdminStatsGraphEngine]]></name>
+      <name>displayAdminStatsGraphEngine</name>
     </hook_alias>
     <hook_alias id="orderReturn">
-			<alias><![CDATA[orderReturn]]></alias>
+      <alias>orderReturn</alias>
-			<name><![CDATA[actionOrderReturn]]></name>
+      <name>actionOrderReturn</name>
     </hook_alias>
     <hook_alias id="productActions">
-			<alias><![CDATA[productActions]]></alias>
+      <alias>productActions</alias>
-			<name><![CDATA[displayProductButtons]]></name>
+      <name>displayProductButtons</name>
     </hook_alias>
     <hook_alias id="backOfficeHome">
-			<alias><![CDATA[backOfficeHome]]></alias>
+      <alias>backOfficeHome</alias>
-			<name><![CDATA[displayBackOfficeHome]]></name>
+      <name>displayBackOfficeHome</name>
     </hook_alias>
     <hook_alias id="GridEngine">
-			<alias><![CDATA[GridEngine]]></alias>
+      <alias>GridEngine</alias>
-			<name><![CDATA[displayAdminStatsGridEngine]]></name>
+      <name>displayAdminStatsGridEngine</name>
     </hook_alias>
     <hook_alias id="watermark">
-			<alias><![CDATA[watermark]]></alias>
+      <alias>watermark</alias>
-			<name><![CDATA[actionWatermark]]></name>
+      <name>actionWatermark</name>
     </hook_alias>
     <hook_alias id="cancelProduct">
-			<alias><![CDATA[cancelProduct]]></alias>
+      <alias>cancelProduct</alias>
-			<name><![CDATA[actionProductCancel]]></name>
+      <name>actionProductCancel</name>
     </hook_alias>
     <hook_alias id="extraLeft">
-			<alias><![CDATA[extraLeft]]></alias>
+      <alias>extraLeft</alias>
-			<name><![CDATA[displayLeftColumnProduct]]></name>
+      <name>displayLeftColumnProduct</name>
     </hook_alias>
     <hook_alias id="productOutOfStock">
-			<alias><![CDATA[productOutOfStock]]></alias>
+      <alias>productOutOfStock</alias>
-			<name><![CDATA[actionProductOutOfStock]]></name>
+      <name>actionProductOutOfStock</name>
     </hook_alias>
     <hook_alias id="updateProductAttribute">
-			<alias><![CDATA[updateProductAttribute]]></alias>
+      <alias>updateProductAttribute</alias>
-			<name><![CDATA[actionProductAttributeUpdate]]></name>
+      <name>actionProductAttributeUpdate</name>
     </hook_alias>
     <hook_alias id="extraCarrier">
-			<alias><![CDATA[extraCarrier]]></alias>
+      <alias>extraCarrier</alias>
-			<name><![CDATA[displayCarrierList]]></name>
+      <name>displayCarrierList</name>
     </hook_alias>
     <hook_alias id="shoppingCartExtra">
-			<alias><![CDATA[shoppingCartExtra]]></alias>
+      <alias>shoppingCartExtra</alias>
-			<name><![CDATA[displayShoppingCart]]></name>
+      <name>displayShoppingCart</name>
     </hook_alias>
     <hook_alias id="search">
-			<alias><![CDATA[search]]></alias>
+      <alias>search</alias>
-			<name><![CDATA[actionSearch]]></name>
+      <name>actionSearch</name>
     </hook_alias>
     <hook_alias id="backBeforePayment">
-			<alias><![CDATA[backBeforePayment]]></alias>
+      <alias>backBeforePayment</alias>
-			<name><![CDATA[displayBeforePayment]]></name>
+      <name>displayBeforePayment</name>
     </hook_alias>
     <hook_alias id="updateCarrier">
-			<alias><![CDATA[updateCarrier]]></alias>
+      <alias>updateCarrier</alias>
-			<name><![CDATA[actionCarrierUpdate]]></name>
+      <name>actionCarrierUpdate</name>
     </hook_alias>
     <hook_alias id="postUpdateOrderStatus">
-			<alias><![CDATA[postUpdateOrderStatus]]></alias>
+      <alias>postUpdateOrderStatus</alias>
-			<name><![CDATA[actionOrderStatusPostUpdate]]></name>
+      <name>actionOrderStatusPostUpdate</name>
     </hook_alias>
     <hook_alias id="createAccountTop">
-			<alias><![CDATA[createAccountTop]]></alias>
+      <alias>createAccountTop</alias>
-			<name><![CDATA[displayCustomerAccountFormTop]]></name>
+      <name>displayCustomerAccountFormTop</name>
     </hook_alias>
     <hook_alias id="backOfficeHeader">
-			<alias><![CDATA[backOfficeHeader]]></alias>
+      <alias>backOfficeHeader</alias>
-			<name><![CDATA[displayBackOfficeHeader]]></name>
+      <name>displayBackOfficeHeader</name>
     </hook_alias>
     <hook_alias id="backOfficeTop">
-			<alias><![CDATA[backOfficeTop]]></alias>
+      <alias>backOfficeTop</alias>
-			<name><![CDATA[displayBackOfficeTop]]></name>
+      <name>displayBackOfficeTop</name>
     </hook_alias>
     <hook_alias id="backOfficeFooter">
-			<alias><![CDATA[backOfficeFooter]]></alias>
+      <alias>backOfficeFooter</alias>
-			<name><![CDATA[displayBackOfficeFooter]]></name>
+      <name>displayBackOfficeFooter</name>
     </hook_alias>
     <hook_alias id="deleteProductAttribute">
-			<alias><![CDATA[deleteProductAttribute]]></alias>
+      <alias>deleteProductAttribute</alias>
-			<name><![CDATA[actionProductAttributeDelete]]></name>
+      <name>actionProductAttributeDelete</name>
     </hook_alias>
     <hook_alias id="processCarrier">
-			<alias><![CDATA[processCarrier]]></alias>
+      <alias>processCarrier</alias>
-			<name><![CDATA[actionCarrierProcess]]></name>
+      <name>actionCarrierProcess</name>
     </hook_alias>
     <hook_alias id="orderDetail">
-			<alias><![CDATA[orderDetail]]></alias>
+      <alias>orderDetail</alias>
-			<name><![CDATA[actionOrderDetail]]></name>
+      <name>actionOrderDetail</name>
     </hook_alias>
     <hook_alias id="beforeCarrier">
-			<alias><![CDATA[beforeCarrier]]></alias>
+      <alias>beforeCarrier</alias>
-			<name><![CDATA[displayBeforeCarrier]]></name>
+      <name>displayBeforeCarrier</name>
     </hook_alias>
     <hook_alias id="orderDetailDisplayed">
-			<alias><![CDATA[orderDetailDisplayed]]></alias>
+      <alias>orderDetailDisplayed</alias>
-			<name><![CDATA[displayOrderDetail]]></name>
+      <name>displayOrderDetail</name>
     </hook_alias>
     <hook_alias id="paymentCCAdded">
-			<alias><![CDATA[paymentCCAdded]]></alias>
+      <alias>paymentCCAdded</alias>
-			<name><![CDATA[actionPaymentCCAdd]]></name>
+      <name>actionPaymentCCAdd</name>
     </hook_alias>
     <hook_alias id="extraProductComparison">
-			<alias><![CDATA[extraProductComparison]]></alias>
+      <alias>extraProductComparison</alias>
-			<name><![CDATA[displayProductComparison]]></name>
+      <name>displayProductComparison</name>
     </hook_alias>
     <hook_alias id="categoryAddition">
-			<alias><![CDATA[categoryAddition]]></alias>
+      <alias>categoryAddition</alias>
-			<name><![CDATA[actionCategoryAdd]]></name>
+      <name>actionCategoryAdd</name>
     </hook_alias>
     <hook_alias id="categoryUpdate">
-			<alias><![CDATA[categoryUpdate]]></alias>
+      <alias>categoryUpdate</alias>
-			<name><![CDATA[actionCategoryUpdate]]></name>
+      <name>actionCategoryUpdate</name>
     </hook_alias>
     <hook_alias id="categoryDeletion">
-			<alias><![CDATA[categoryDeletion]]></alias>
+      <alias>categoryDeletion</alias>
-			<name><![CDATA[actionCategoryDelete]]></name>
+      <name>actionCategoryDelete</name>
     </hook_alias>
     <hook_alias id="beforeAuthentication">
-			<alias><![CDATA[beforeAuthentication]]></alias>
+      <alias>beforeAuthentication</alias>
-			<name><![CDATA[actionBeforeAuthentication]]></name>
+      <name>actionBeforeAuthentication</name>
     </hook_alias>
     <hook_alias id="paymentTop">
-			<alias><![CDATA[paymentTop]]></alias>
+      <alias>paymentTop</alias>
-			<name><![CDATA[displayPaymentTop]]></name>
+      <name>displayPaymentTop</name>
     </hook_alias>
     <hook_alias id="afterCreateHtaccess">
-			<alias><![CDATA[afterCreateHtaccess]]></alias>
+      <alias>afterCreateHtaccess</alias>
-			<name><![CDATA[actionHtaccessCreate]]></name>
+      <name>actionHtaccessCreate</name>
     </hook_alias>
     <hook_alias id="afterSaveAdminMeta">
-			<alias><![CDATA[afterSaveAdminMeta]]></alias>
+      <alias>afterSaveAdminMeta</alias>
-			<name><![CDATA[actionAdminMetaSave]]></name>
+      <name>actionAdminMetaSave</name>
     </hook_alias>
     <hook_alias id="attributeGroupForm">
-			<alias><![CDATA[attributeGroupForm]]></alias>
+      <alias>attributeGroupForm</alias>
-			<name><![CDATA[displayAttributeGroupForm]]></name>
+      <name>displayAttributeGroupForm</name>
     </hook_alias>
     <hook_alias id="afterSaveAttributeGroup">
-			<alias><![CDATA[afterSaveAttributeGroup]]></alias>
+      <alias>afterSaveAttributeGroup</alias>
-			<name><![CDATA[actionAttributeGroupSave]]></name>
+      <name>actionAttributeGroupSave</name>
     </hook_alias>
     <hook_alias id="afterDeleteAttributeGroup">
-			<alias><![CDATA[afterDeleteAttributeGroup]]></alias>
+      <alias>afterDeleteAttributeGroup</alias>
-			<name><![CDATA[actionAttributeGroupDelete]]></name>
+      <name>actionAttributeGroupDelete</name>
     </hook_alias>
     <hook_alias id="featureForm">
-			<alias><![CDATA[featureForm]]></alias>
+      <alias>featureForm</alias>
-			<name><![CDATA[displayFeatureForm]]></name>
+      <name>displayFeatureForm</name>
     </hook_alias>
     <hook_alias id="afterSaveFeature">
-			<alias><![CDATA[afterSaveFeature]]></alias>
+      <alias>afterSaveFeature</alias>
-			<name><![CDATA[actionFeatureSave]]></name>
+      <name>actionFeatureSave</name>
     </hook_alias>
     <hook_alias id="afterDeleteFeature">
-			<alias><![CDATA[afterDeleteFeature]]></alias>
+      <alias>afterDeleteFeature</alias>
-			<name><![CDATA[actionFeatureDelete]]></name>
+      <name>actionFeatureDelete</name>
     </hook_alias>
     <hook_alias id="afterSaveProduct">
-			<alias><![CDATA[afterSaveProduct]]></alias>
+      <alias>afterSaveProduct</alias>
-			<name><![CDATA[actionProductSave]]></name>
+      <name>actionProductSave</name>
     </hook_alias>
     <hook_alias id="productListAssign">
-			<alias><![CDATA[productListAssign]]></alias>
+      <alias>productListAssign</alias>
-			<name><![CDATA[actionProductListOverride]]></name>
+      <name>actionProductListOverride</name>
     </hook_alias>
     <hook_alias id="postProcessAttributeGroup">
-			<alias><![CDATA[postProcessAttributeGroup]]></alias>
+      <alias>postProcessAttributeGroup</alias>
-			<name><![CDATA[displayAttributeGroupPostProcess]]></name>
+      <name>displayAttributeGroupPostProcess</name>
     </hook_alias>
     <hook_alias id="postProcessFeature">
-			<alias><![CDATA[postProcessFeature]]></alias>
+      <alias>postProcessFeature</alias>
-			<name><![CDATA[displayFeaturePostProcess]]></name>
+      <name>displayFeaturePostProcess</name>
     </hook_alias>
     <hook_alias id="featureValueForm">
-			<alias><![CDATA[featureValueForm]]></alias>
+      <alias>featureValueForm</alias>
-			<name><![CDATA[displayFeatureValueForm]]></name>
+      <name>displayFeatureValueForm</name>
     </hook_alias>
     <hook_alias id="postProcessFeatureValue">
-			<alias><![CDATA[postProcessFeatureValue]]></alias>
+      <alias>postProcessFeatureValue</alias>
-			<name><![CDATA[displayFeatureValuePostProcess]]></name>
+      <name>displayFeatureValuePostProcess</name>
     </hook_alias>
     <hook_alias id="afterDeleteFeatureValue">
-			<alias><![CDATA[afterDeleteFeatureValue]]></alias>
+      <alias>afterDeleteFeatureValue</alias>
-			<name><![CDATA[actionFeatureValueDelete]]></name>
+      <name>actionFeatureValueDelete</name>
     </hook_alias>
     <hook_alias id="afterSaveFeatureValue">
-			<alias><![CDATA[afterSaveFeatureValue]]></alias>
+      <alias>afterSaveFeatureValue</alias>
-			<name><![CDATA[actionFeatureValueSave]]></name>
+      <name>actionFeatureValueSave</name>
     </hook_alias>
     <hook_alias id="attributeForm">
-			<alias><![CDATA[attributeForm]]></alias>
+      <alias>attributeForm</alias>
-			<name><![CDATA[displayAttributeForm]]></name>
+      <name>displayAttributeForm</name>
     </hook_alias>
     <hook_alias id="postProcessAttribute">
-			<alias><![CDATA[postProcessAttribute]]></alias>
+      <alias>postProcessAttribute</alias>
-			<name><![CDATA[actionAttributePostProcess]]></name>
+      <name>actionAttributePostProcess</name>
     </hook_alias>
     <hook_alias id="afterDeleteAttribute">
-			<alias><![CDATA[afterDeleteAttribute]]></alias>
+      <alias>afterDeleteAttribute</alias>
-			<name><![CDATA[actionAttributeDelete]]></name>
+      <name>actionAttributeDelete</name>
     </hook_alias>
     <hook_alias id="afterSaveAttribute">
-			<alias><![CDATA[afterSaveAttribute]]></alias>
+      <alias>afterSaveAttribute</alias>
-			<name><![CDATA[actionAttributeSave]]></name>
+      <name>actionAttributeSave</name>
     </hook_alias>
     <hook_alias id="taxManager">
-			<alias><![CDATA[taxManager]]></alias>
+      <alias>taxManager</alias>
-			<name><![CDATA[actionTaxManager]]></name>
+      <name>actionTaxManager</name>
     </hook_alias>
   </entities>
 </entity_hook_alias>

install-new/data/xml/image_type.xml

@@ -11,14 +11,13 @@
     <field name="scenes"/>
     <field name="stores"/>
   </fields>
-
   <entities>
     <image_type id="small" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-		<image_type id="medium" name="medium" width="80" height="80" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1" />
+    <image_type id="medium" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
-		<image_type id="large" name="large" width="300" height="300" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0" />
+    <image_type id="large" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
     <image_type id="thickbox" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
     <image_type id="category" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-		<image_type id="home" name="home" width="129" height="129" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0" />
+    <image_type id="home" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
     <image_type id="large_scene" name="large_scene" width="556" height="200" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
     <image_type id="thumb_scene" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
   </entities>

install-new/data/xml/meta.xml

@@ -3,82 +3,81 @@
   <fields id="page" class="Meta">
     <field name="page"/>
   </fields>
-
   <entities>
     <meta id="404">
-			<page><![CDATA[404]]></page>
+      <page>404</page>
     </meta>
     <meta id="best-sales">
-			<page><![CDATA[best-sales]]></page>
+      <page>best-sales</page>
     </meta>
     <meta id="contact-form">
-			<page><![CDATA[contact-form]]></page>
+      <page>contact-form</page>
     </meta>
     <meta id="index">
-			<page><![CDATA[index]]></page>
+      <page>index</page>
     </meta>
     <meta id="manufacturer">
-			<page><![CDATA[manufacturer]]></page>
+      <page>manufacturer</page>
     </meta>
     <meta id="new-products">
-			<page><![CDATA[new-products]]></page>
+      <page>new-products</page>
     </meta>
     <meta id="password">
-			<page><![CDATA[password]]></page>
+      <page>password</page>
     </meta>
     <meta id="prices-drop">
-			<page><![CDATA[prices-drop]]></page>
+      <page>prices-drop</page>
     </meta>
     <meta id="sitemap">
-			<page><![CDATA[sitemap]]></page>
+      <page>sitemap</page>
     </meta>
-		<meta id="supplier">
+    <meta id="supply">
-			<page><![CDATA[supplier]]></page>
+      <page>supply</page>
     </meta>
     <meta id="address">
-			<page><![CDATA[address]]></page>
+      <page>address</page>
     </meta>
     <meta id="addresses">
-			<page><![CDATA[addresses]]></page>
+      <page>addresses</page>
     </meta>
     <meta id="authentication">
-			<page><![CDATA[authentication]]></page>
+      <page>authentication</page>
     </meta>
     <meta id="cart">
-			<page><![CDATA[cart]]></page>
+      <page>cart</page>
     </meta>
     <meta id="discount">
-			<page><![CDATA[discount]]></page>
+      <page>discount</page>
     </meta>
     <meta id="history">
-			<page><![CDATA[history]]></page>
+      <page>history</page>
     </meta>
     <meta id="identity">
-			<page><![CDATA[identity]]></page>
+      <page>identity</page>
     </meta>
     <meta id="my-account">
-			<page><![CDATA[my-account]]></page>
+      <page>my-account</page>
     </meta>
     <meta id="order-follow">
-			<page><![CDATA[order-follow]]></page>
+      <page>order-follow</page>
     </meta>
     <meta id="order-slip">
-			<page><![CDATA[order-slip]]></page>
+      <page>order-slip</page>
     </meta>
     <meta id="order">
-			<page><![CDATA[order]]></page>
+      <page>order</page>
     </meta>
     <meta id="search">
-			<page><![CDATA[search]]></page>
+      <page>search</page>
     </meta>
     <meta id="stores">
-			<page><![CDATA[stores]]></page>
+      <page>stores</page>
     </meta>
     <meta id="order-opc">
-			<page><![CDATA[order-opc]]></page>
+      <page>order-opc</page>
     </meta>
     <meta id="guest-tracking">
-			<page><![CDATA[guest-tracking]]></page>
+      <page>guest-tracking</page>
     </meta>
   </entities>
 </entity_meta>

install-new/data/xml/operating_system.xml

@@ -3,19 +3,18 @@
   <fields id="name">
     <field name="name"/>
   </fields>
-
   <entities>
     <operating_system id="Windows_XP">
-			<name><![CDATA[Windows XP]]></name>
+      <name>Windows XP</name>
     </operating_system>
     <operating_system id="Windows_Vista">
-			<name><![CDATA[Windows Vista]]></name>
+      <name>Windows Vista</name>
     </operating_system>
     <operating_system id="MacOsX">
-			<name><![CDATA[MacOsX]]></name>
+      <name>MacOsX</name>
     </operating_system>
     <operating_system id="Linux">
-			<name><![CDATA[Linux]]></name>
+      <name>Linux</name>
     </operating_system>
   </entities>
 </entity_operating_system>

install-new/data/xml/order_return_state.xml

@@ -3,12 +3,11 @@
   <fields id="name" class="OrderReturnState">
     <field name="color"/>
   </fields>
-
   <entities>
-		<order_return_state id="Waiting_for_confirmation" color="#ADD8E6" />
+    <order_return_state id="Waiting_for_confirmation" color="RoyalBlue"/>
     <order_return_state id="Waiting_for_package" color="BlueViolet"/>
-		<order_return_state id="Package_received" color="Crimson" />
+    <order_return_state id="Package_received" color="LimeGreen"/>
-		<order_return_state id="Return_denied" color="HotPink" />
+    <order_return_state id="Return_denied" color="Crimson"/>
-		<order_return_state id="Return_completed" color="Orange" />
+    <order_return_state id="Return_completed" color="#108510"/>
   </entities>
 </entity_order_return_state>

install-new/data/xml/order_state.xml

@@ -9,20 +9,20 @@
     <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" />
+    <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" />
+    <order_state id="Payment_accepted" invoice="1" send_email="1" color="LimeGreen" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1"/>
-		<order_state id="Preparation_in_progress" invoice="1" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="1" delivery="1" shipped="0" />
+    <order_state id="Preparation_in_progress" invoice="1" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="1" delivery="1" shipped="0" paid="1"/>
-		<order_state id="Shipped" invoice="1" send_email="1" color="BlueViolet" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" />
+    <order_state id="Shipped" invoice="1" send_email="1" color="BlueViolet" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" paid="1"/>
-		<order_state id="Delivered" invoice="1" send_email="0" color="Crimson" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" />
+    <order_state id="Delivered" invoice="1" send_email="0" color="#108510" unremovable="1" hidden="0" logable="1" delivery="1" shipped="1" paid="1"/>
-		<order_state id="Canceled" invoice="0" send_email="1" color="#999999" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <order_state id="Canceled" invoice="0" send_email="1" color="Crimson" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
-		<order_state id="Refund" invoice="1" send_email="1" color="Orange" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <order_state id="Refund" invoice="1" send_email="1" color="#ec2e15" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
-		<order_state id="Payment_error" invoice="0" send_email="1" color="DarkOrange" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <order_state id="Payment_error" invoice="0" send_email="1" color="#8f0621" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
-		<order_state id="On_backorder" invoice="1" send_email="1" color="HotPink" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <order_state id="On_backorder" invoice="1" send_email="1" color="HotPink" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="1"/>
-		<order_state id="Awaiting_bank_wire_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <order_state id="Awaiting_bank_wire_payment" invoice="0" send_email="1" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0"/>
-		<order_state id="Awaiting_PayPal_payment" invoice="0" send_email="0" color="RoyalBlue" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" />
+    <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" />
+    <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>
 </entity_order_state>

install-new/data/xml/profile.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_profile>
-	<fields id="name" class="Profile" sql="a.id_profile = 1">
+  <fields id="name" class="Profile" sql="a.id_profile = 1"/>
-	</fields>
-
   <entities>
     <profile id="SuperAdmin"/>
   </entities>

install-new/data/xml/quick_access.xml

@@ -4,22 +4,21 @@
     <field name="new_window"/>
     <field name="link"/>
   </fields>
-
   <entities>
     <quick_access id="Home" new_window="0">
-			<link><![CDATA[index.php]]></link>
+      <link>index.php</link>
     </quick_access>
     <quick_access id="My_Shop" new_window="1">
-			<link><![CDATA[../]]></link>
+      <link>../</link>
     </quick_access>
     <quick_access id="New_category" new_window="0">
-			<link><![CDATA[index.php?controller=AdminCatalog&addcategory]]></link>
+      <link>index.php?controller=AdminCategories&amp;addcategory</link>
     </quick_access>
     <quick_access id="New_product" new_window="0">
-			<link><![CDATA[index.php?controller=AdminCatalog&addproduct]]></link>
+      <link>index.php?controller=AdminProducts&amp;addproduct</link>
     </quick_access>
     <quick_access id="New_voucher" new_window="0">
-			<link><![CDATA[index.php?controller=AdminCartRules&addcart_rule]]></link>
+      <link>index.php?controller=AdminCartRules&amp;addcart_rule</link>
     </quick_access>
   </entities>
 </entity_quick_access>

install-new/data/xml/search_engine.xml

@@ -4,121 +4,120 @@
     <field name="server"/>
     <field name="getvar"/>
   </fields>
-
   <entities>
     <search_engine id="google" getvar="q">
-			<server><![CDATA[google]]></server>
+      <server>google</server>
     </search_engine>
     <search_engine id="aol" getvar="q">
-			<server><![CDATA[aol]]></server>
+      <server>aol</server>
     </search_engine>
     <search_engine id="yandex" getvar="text">
-			<server><![CDATA[yandex]]></server>
+      <server>yandex</server>
     </search_engine>
     <search_engine id="ask_com" getvar="q">
-			<server><![CDATA[ask.com]]></server>
+      <server>ask.com</server>
     </search_engine>
     <search_engine id="nhl_com" getvar="q">
-			<server><![CDATA[nhl.com]]></server>
+      <server>nhl.com</server>
     </search_engine>
     <search_engine id="yahoo" getvar="p">
-			<server><![CDATA[yahoo]]></server>
+      <server>yahoo</server>
     </search_engine>
     <search_engine id="baidu" getvar="wd">
-			<server><![CDATA[baidu]]></server>
+      <server>baidu</server>
     </search_engine>
     <search_engine id="lycos" getvar="query">
-			<server><![CDATA[lycos]]></server>
+      <server>lycos</server>
     </search_engine>
     <search_engine id="exalead" getvar="q">
-			<server><![CDATA[exalead]]></server>
+      <server>exalead</server>
     </search_engine>
     <search_engine id="search_live" getvar="q">
-			<server><![CDATA[search.live]]></server>
+      <server>search.live</server>
     </search_engine>
     <search_engine id="voila" getvar="rdata">
-			<server><![CDATA[voila]]></server>
+      <server>voila</server>
     </search_engine>
     <search_engine id="altavista" getvar="q">
-			<server><![CDATA[altavista]]></server>
+      <server>altavista</server>
     </search_engine>
     <search_engine id="bing" getvar="q">
-			<server><![CDATA[bing]]></server>
+      <server>bing</server>
     </search_engine>
     <search_engine id="daum" getvar="q">
-			<server><![CDATA[daum]]></server>
+      <server>daum</server>
     </search_engine>
     <search_engine id="eniro" getvar="search_word">
-			<server><![CDATA[eniro]]></server>
+      <server>eniro</server>
     </search_engine>
     <search_engine id="naver" getvar="query">
-			<server><![CDATA[naver]]></server>
+      <server>naver</server>
     </search_engine>
     <search_engine id="msn" getvar="q">
-			<server><![CDATA[msn]]></server>
+      <server>msn</server>
     </search_engine>
     <search_engine id="netscape" getvar="query">
-			<server><![CDATA[netscape]]></server>
+      <server>netscape</server>
     </search_engine>
     <search_engine id="cnn" getvar="query">
-			<server><![CDATA[cnn]]></server>
+      <server>cnn</server>
     </search_engine>
     <search_engine id="about" getvar="terms">
-			<server><![CDATA[about]]></server>
+      <server>about</server>
     </search_engine>
     <search_engine id="mamma" getvar="query">
-			<server><![CDATA[mamma]]></server>
+      <server>mamma</server>
     </search_engine>
     <search_engine id="alltheweb" getvar="q">
-			<server><![CDATA[alltheweb]]></server>
+      <server>alltheweb</server>
     </search_engine>
     <search_engine id="virgilio" getvar="qs">
-			<server><![CDATA[virgilio]]></server>
+      <server>virgilio</server>
     </search_engine>
     <search_engine id="alice" getvar="qs">
-			<server><![CDATA[alice]]></server>
+      <server>alice</server>
     </search_engine>
     <search_engine id="najdi" getvar="q">
-			<server><![CDATA[najdi]]></server>
+      <server>najdi</server>
     </search_engine>
     <search_engine id="mama" getvar="query">
-			<server><![CDATA[mama]]></server>
+      <server>mama</server>
     </search_engine>
     <search_engine id="seznam" getvar="q">
-			<server><![CDATA[seznam]]></server>
+      <server>seznam</server>
     </search_engine>
     <search_engine id="onet" getvar="qt">
-			<server><![CDATA[onet]]></server>
+      <server>onet</server>
     </search_engine>
     <search_engine id="szukacz" getvar="q">
-			<server><![CDATA[szukacz]]></server>
+      <server>szukacz</server>
     </search_engine>
     <search_engine id="yam" getvar="k">
-			<server><![CDATA[yam]]></server>
+      <server>yam</server>
     </search_engine>
     <search_engine id="pchome" getvar="q">
-			<server><![CDATA[pchome]]></server>
+      <server>pchome</server>
     </search_engine>
     <search_engine id="kvasir" getvar="q">
-			<server><![CDATA[kvasir]]></server>
+      <server>kvasir</server>
     </search_engine>
     <search_engine id="sesam" getvar="q">
-			<server><![CDATA[sesam]]></server>
+      <server>sesam</server>
     </search_engine>
     <search_engine id="ozu" getvar="q">
-			<server><![CDATA[ozu]]></server>
+      <server>ozu</server>
     </search_engine>
     <search_engine id="terra" getvar="query">
-			<server><![CDATA[terra]]></server>
+      <server>terra</server>
     </search_engine>
     <search_engine id="mynet" getvar="q">
-			<server><![CDATA[mynet]]></server>
+      <server>mynet</server>
     </search_engine>
     <search_engine id="ekolay" getvar="q">
-			<server><![CDATA[ekolay]]></server>
+      <server>ekolay</server>
     </search_engine>
     <search_engine id="rambler" getvar="words">
-			<server><![CDATA[rambler]]></server>
+      <server>rambler</server>
     </search_engine>
   </entities>
 </entity_search_engine>

install-new/data/xml/stock_mvt_reason.xml

@@ -3,15 +3,14 @@
   <fields id="name" class="StockMvtReason">
     <field name="sign"/>
   </fields>
-
   <entities>
     <stock_mvt_reason id="Increase" sign="1"/>
     <stock_mvt_reason id="Decrease" sign="-1"/>
-		<stock_mvt_reason id="Client_Order" sign="-1" />
+    <stock_mvt_reason id="Customer_Order" sign="-1"/>
-		<stock_mvt_reason id="Missing_Stock_Movement" sign="-1" />
+    <stock_mvt_reason id="Regulation_following_an_inventory_of_stock" sign="-1"/>
-		<stock_mvt_reason id="Restocking" sign="1" />
+    <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1" sign="1"/>
-		<stock_mvt_reason id="Transfer_to" sign="1" />
+    <stock_mvt_reason id="Transfer_to_another_warehouse" sign="-1"/>
-		<stock_mvt_reason id="Transfer_from" sign="-1" />
+    <stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/>
-		<stock_mvt_reason id="Supplier_Order" sign="1" />
+    <stock_mvt_reason id="Supply_Order" sign="1"/>
   </entities>
 </entity_stock_mvt_reason>

install-new/data/xml/subdomain.xml

@@ -3,7 +3,6 @@
   <fields id="name" class="SubDomain">
     <field name="name"/>
   </fields>
-
   <entities>
     <subdomain id="www" name="www"/>
   </entities>

install-new/data/xml/supplier_order_state.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity_supplier_order_state>
-	<fields id="name">
-		<field name="delivery_note" />
-		<field name="editable" />
-		<field name="receipt_state" />
-		<field name="pending_receipt" />
-		<field name="enclosed" />
-		<field name="color" />
-	</fields>
-
-	<entities>
-		<supplier_order_state id="creation_in_progress" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00" />
-		<supplier_order_state id="Order_validated" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff" />
-		<supplier_order_state id="Pending_receipt" delivery_note="0" editable="0" receipt_state="0" pending_receipt="1" enclosed="0" color="#ff37f5" />
-		<supplier_order_state id="Order_received_in_part" delivery_note="0" editable="0" receipt_state="1" pending_receipt="1" enclosed="0" color="#ff3e33" />
-		<supplier_order_state id="Order_received_completely" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c" />
-		<supplier_order_state id="order_fenced" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666" />
-	</entities>
-</entity_supplier_order_state>

install-new/data/xml/supply_order_state.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<entity_supply_order_state>
+  <fields class="SupplyOrderState">
+    <field name="delivery_note"/>
+    <field name="editable"/>
+    <field name="receipt_state"/>
+    <field name="pending_receipt"/>
+    <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>

install-new/data/xml/tab.xml

@@ -4,292 +4,303 @@
     <field name="id_parent" relation="tab"/>
     <field name="class_name"/>
   </fields>
-
   <entities>
     <tab id="Catalog" id_parent="">
-			<class_name><![CDATA[AdminCatalog]]></class_name>
+      <class_name>AdminCatalog</class_name>
     </tab>
     <tab id="Customers" id_parent="">
-			<class_name><![CDATA[AdminCustomers]]></class_name>
+      <class_name>AdminCustomers</class_name>
     </tab>
     <tab id="Orders" id_parent="">
-			<class_name><![CDATA[AdminOrders]]></class_name>
+      <class_name>AdminOrders</class_name>
     </tab>
     <tab id="Payment" id_parent="">
-			<class_name><![CDATA[AdminPayment]]></class_name>
+      <class_name>AdminPayment</class_name>
     </tab>
     <tab id="Shipping" id_parent="">
-			<class_name><![CDATA[AdminShipping]]></class_name>
+      <class_name>AdminShipping</class_name>
     </tab>
     <tab id="Stats" id_parent="">
-			<class_name><![CDATA[AdminStats]]></class_name>
+      <class_name>AdminStats</class_name>
     </tab>
     <tab id="Modules" id_parent="">
-			<class_name><![CDATA[AdminModules]]></class_name>
+      <class_name>AdminModules</class_name>
     </tab>
     <tab id="Preferences" id_parent="">
-			<class_name><![CDATA[AdminPreferences]]></class_name>
+      <class_name>AdminPreferences</class_name>
     </tab>
     <tab id="Tools" id_parent="">
-			<class_name><![CDATA[AdminTools]]></class_name>
+      <class_name>AdminTools</class_name>
     </tab>
     <tab id="Manufacturers" id_parent="Catalog">
-			<class_name><![CDATA[AdminManufacturers]]></class_name>
+      <class_name>AdminManufacturers</class_name>
     </tab>
     <tab id="Attributes_and_Groups" id_parent="Catalog">
-			<class_name><![CDATA[AdminAttributesGroups]]></class_name>
+      <class_name>AdminAttributesGroups</class_name>
     </tab>
     <tab id="Addresses" id_parent="Customers">
-			<class_name><![CDATA[AdminAddresses]]></class_name>
+      <class_name>AdminAddresses</class_name>
     </tab>
     <tab id="Statuses" id_parent="Orders">
-			<class_name><![CDATA[AdminStatuses]]></class_name>
+      <class_name>AdminStatuses</class_name>
     </tab>
     <tab id="Cart_Rules" id_parent="Payment">
-			<class_name><![CDATA[AdminCartRules]]></class_name>
+      <class_name>AdminCartRules</class_name>
     </tab>
     <tab id="Currencies" id_parent="Payment">
-			<class_name><![CDATA[AdminCurrencies]]></class_name>
+      <class_name>AdminCurrencies</class_name>
     </tab>
     <tab id="Taxes" id_parent="Payment">
-			<class_name><![CDATA[AdminTaxes]]></class_name>
+      <class_name>AdminTaxes</class_name>
     </tab>
     <tab id="Carriers" id_parent="Shipping">
-			<class_name><![CDATA[AdminCarriers]]></class_name>
+      <class_name>AdminCarriers</class_name>
     </tab>
     <tab id="Countries" id_parent="Shipping">
-			<class_name><![CDATA[AdminCountries]]></class_name>
+      <class_name>AdminCountries</class_name>
     </tab>
     <tab id="Zones" id_parent="Shipping">
-			<class_name><![CDATA[AdminZones]]></class_name>
+      <class_name>AdminZones</class_name>
     </tab>
     <tab id="Price_Ranges" id_parent="Shipping">
-			<class_name><![CDATA[AdminRangePrice]]></class_name>
+      <class_name>AdminRangePrice</class_name>
     </tab>
     <tab id="Weight_Ranges" id_parent="Shipping">
-			<class_name><![CDATA[AdminRangeWeight]]></class_name>
+      <class_name>AdminRangeWeight</class_name>
     </tab>
     <tab id="Positions" id_parent="Modules">
-			<class_name><![CDATA[AdminModulesPositions]]></class_name>
+      <class_name>AdminModulesPositions</class_name>
     </tab>
     <tab id="Database" id_parent="Preferences">
-			<class_name><![CDATA[AdminDb]]></class_name>
+      <class_name>AdminDb</class_name>
     </tab>
     <tab id="E-mail" id_parent="Preferences">
-			<class_name><![CDATA[AdminEmails]]></class_name>
+      <class_name>AdminEmails</class_name>
     </tab>
     <tab id="Images" id_parent="Preferences">
-			<class_name><![CDATA[AdminImages]]></class_name>
+      <class_name>AdminImages</class_name>
     </tab>
     <tab id="Products" id_parent="Preferences">
-			<class_name><![CDATA[AdminPPreferences]]></class_name>
+      <class_name>AdminPPreferences</class_name>
     </tab>
     <tab id="Contacts" id_parent="tab_29">
-			<class_name><![CDATA[AdminContacts]]></class_name>
+      <class_name>AdminContacts</class_name>
     </tab>
     <tab id="tab_29" id_parent="">
-			<class_name><![CDATA[AdminEmployees]]></class_name>
+      <class_name>AdminEmployees</class_name>
     </tab>
     <tab id="Profiles" id_parent="tab_29">
-			<class_name><![CDATA[AdminProfiles]]></class_name>
+      <class_name>AdminProfiles</class_name>
     </tab>
     <tab id="Permissions" id_parent="tab_29">
-			<class_name><![CDATA[AdminAccess]]></class_name>
+      <class_name>AdminAccess</class_name>
     </tab>
     <tab id="Languages" id_parent="Tools">
-			<class_name><![CDATA[AdminLanguages]]></class_name>
+      <class_name>AdminLanguages</class_name>
     </tab>
     <tab id="Translations" id_parent="Tools">
-			<class_name><![CDATA[AdminTranslations]]></class_name>
+      <class_name>AdminTranslations</class_name>
     </tab>
     <tab id="Suppliers" id_parent="Catalog">
-			<class_name><![CDATA[AdminSuppliers]]></class_name>
+      <class_name>AdminSuppliers</class_name>
     </tab>
     <tab id="Tabs" id_parent="tab_29">
-			<class_name><![CDATA[AdminTabs]]></class_name>
+      <class_name>AdminTabs</class_name>
     </tab>
     <tab id="Features" id_parent="Catalog">
-			<class_name><![CDATA[AdminFeatures]]></class_name>
+      <class_name>AdminFeatures</class_name>
     </tab>
     <tab id="Quick_Access" id_parent="Tools">
-			<class_name><![CDATA[AdminQuickAccesses]]></class_name>
+      <class_name>AdminQuickAccesses</class_name>
     </tab>
     <tab id="Themes" id_parent="Preferences">
-			<class_name><![CDATA[AdminThemes]]></class_name>
+      <class_name>AdminThemes</class_name>
     </tab>
     <tab id="Contact_Information" id_parent="Preferences">
-			<class_name><![CDATA[AdminContact]]></class_name>
+      <class_name>AdminContact</class_name>
     </tab>
     <tab id="Keyword_Typos" id_parent="Preferences">
-			<class_name><![CDATA[AdminAliases]]></class_name>
+      <class_name>AdminAliases</class_name>
     </tab>
     <tab id="CSV_Import" id_parent="Tools">
-			<class_name><![CDATA[AdminImport]]></class_name>
+      <class_name>AdminImport</class_name>
     </tab>
     <tab id="Invoices" id_parent="Orders">
-			<class_name><![CDATA[AdminInvoices]]></class_name>
+      <class_name>AdminInvoices</class_name>
     </tab>
-		<tab id="Search" id_parent="">
+    <tab id="Search" id_parent="-1">
-			<class_name><![CDATA[AdminSearch]]></class_name>
+      <class_name>AdminSearch</class_name>
     </tab>
     <tab id="Localization" id_parent="Preferences">
-			<class_name><![CDATA[AdminLocalization]]></class_name>
+      <class_name>AdminLocalization</class_name>
     </tab>
     <tab id="States" id_parent="Shipping">
-			<class_name><![CDATA[AdminStates]]></class_name>
+      <class_name>AdminStates</class_name>
     </tab>
     <tab id="Merchandise_Returns" id_parent="Orders">
-			<class_name><![CDATA[AdminReturn]]></class_name>
+      <class_name>AdminReturn</class_name>
     </tab>
     <tab id="PDF" id_parent="Orders">
-			<class_name><![CDATA[AdminPDF]]></class_name>
+      <class_name>AdminPdf</class_name>
     </tab>
     <tab id="Credit_Slips" id_parent="Orders">
-			<class_name><![CDATA[AdminSlip]]></class_name>
+      <class_name>AdminSlip</class_name>
-		</tab>
-		<tab id="Settings" id_parent="Stats">
-			<class_name><![CDATA[AdminStatsConf]]></class_name>
     </tab>
     <tab id="Subdomains" id_parent="Tools">
-			<class_name><![CDATA[AdminSubDomains]]></class_name>
+      <class_name>AdminSubDomains</class_name>
     </tab>
     <tab id="DB_Backup" id_parent="Tools">
-			<class_name><![CDATA[AdminBackup]]></class_name>
+      <class_name>AdminBackup</class_name>
     </tab>
     <tab id="Order_Messages" id_parent="Orders">
-			<class_name><![CDATA[AdminOrderMessage]]></class_name>
+      <class_name>AdminOrderMessage</class_name>
     </tab>
     <tab id="Delivery_Slips" id_parent="Orders">
-			<class_name><![CDATA[AdminDeliverySlip]]></class_name>
+      <class_name>AdminDeliverySlip</class_name>
     </tab>
     <tab id="SEO_URLs" id_parent="Preferences">
-			<class_name><![CDATA[AdminMeta]]></class_name>
+      <class_name>AdminMeta</class_name>
     </tab>
     <tab id="CMS" id_parent="Tools">
-			<class_name><![CDATA[AdminCMSContent]]></class_name>
+      <class_name>AdminCmsContent</class_name>
     </tab>
     <tab id="Image_Mapping" id_parent="Catalog">
-			<class_name><![CDATA[AdminScenes]]></class_name>
+      <class_name>AdminScenes</class_name>
     </tab>
     <tab id="Customer_Messages" id_parent="Orders">
-			<class_name><![CDATA[AdminMessages]]></class_name>
+      <class_name>AdminMessages</class_name>
     </tab>
     <tab id="Monitoring" id_parent="Catalog">
-			<class_name><![CDATA[AdminTracking]]></class_name>
+      <class_name>AdminTracking</class_name>
     </tab>
     <tab id="Search_Engines" id_parent="Stats">
-			<class_name><![CDATA[AdminSearchEngines]]></class_name>
+      <class_name>AdminSearchEngines</class_name>
     </tab>
     <tab id="Referrers" id_parent="Stats">
-			<class_name><![CDATA[AdminReferrers]]></class_name>
+      <class_name>AdminReferrers</class_name>
     </tab>
     <tab id="Groups" id_parent="Customers">
-			<class_name><![CDATA[AdminGroups]]></class_name>
+      <class_name>AdminGroups</class_name>
     </tab>
     <tab id="Generators" id_parent="Tools">
-			<class_name><![CDATA[AdminGenerator]]></class_name>
+      <class_name>AdminGenerator</class_name>
     </tab>
     <tab id="Shopping_Carts" id_parent="Customers">
-			<class_name><![CDATA[AdminCarts]]></class_name>
+      <class_name>AdminCarts</class_name>
     </tab>
     <tab id="Tags" id_parent="Catalog">
-			<class_name><![CDATA[AdminTags]]></class_name>
+      <class_name>AdminTags</class_name>
     </tab>
     <tab id="Search_1" id_parent="Preferences">
-			<class_name><![CDATA[AdminSearchConf]]></class_name>
+      <class_name>AdminSearchConf</class_name>
     </tab>
     <tab id="Attachments" id_parent="Catalog">
-			<class_name><![CDATA[AdminAttachments]]></class_name>
+      <class_name>AdminAttachments</class_name>
     </tab>
     <tab id="Configuration_Information" id_parent="Tools">
-			<class_name><![CDATA[AdminInformation]]></class_name>
+      <class_name>AdminInformation</class_name>
     </tab>
     <tab id="Performance" id_parent="Preferences">
-			<class_name><![CDATA[AdminPerformance]]></class_name>
+      <class_name>AdminPerformance</class_name>
     </tab>
     <tab id="Customer_Service" id_parent="tab_29">
-			<class_name><![CDATA[AdminCustomerThreads]]></class_name>
+      <class_name>AdminCustomerThreads</class_name>
     </tab>
     <tab id="Webservice" id_parent="Tools">
-			<class_name><![CDATA[AdminWebservice]]></class_name>
+      <class_name>AdminWebservice</class_name>
     </tab>
     <tab id="Stock_Movement" id_parent="tab_95">
-			<class_name><![CDATA[AdminStockMvt]]></class_name>
+      <class_name>AdminStockMvt</class_name>
     </tab>
     <tab id="Modules_Themes_Catalog" id_parent="Modules">
-			<class_name><![CDATA[AdminAddonsCatalog]]></class_name>
+      <class_name>AdminAddonsCatalog</class_name>
     </tab>
     <tab id="My_Account" id_parent="Modules">
-			<class_name><![CDATA[AdminAddonsMyAccount]]></class_name>
+      <class_name>AdminAddonsMyAccount</class_name>
     </tab>
     <tab id="Stores" id_parent="Tools">
-			<class_name><![CDATA[AdminStores]]></class_name>
+      <class_name>AdminStores</class_name>
     </tab>
     <tab id="Themes_1" id_parent="Modules">
-			<class_name><![CDATA[AdminThemes]]></class_name>
+      <class_name>AdminThemes</class_name>
     </tab>
     <tab id="Geolocation" id_parent="Preferences">
-			<class_name><![CDATA[AdminGeolocation]]></class_name>
+      <class_name>AdminGeolocation</class_name>
     </tab>
     <tab id="Tax_Rules" id_parent="Payment">
-			<class_name><![CDATA[AdminTaxRulesGroup]]></class_name>
+      <class_name>AdminTaxRulesGroup</class_name>
     </tab>
     <tab id="Logs" id_parent="Tools">
-			<class_name><![CDATA[AdminLogs]]></class_name>
+      <class_name>AdminLogs</class_name>
     </tab>
-		<tab id="Home" id_parent="">
+    <tab id="Home" id_parent="-1">
-			<class_name><![CDATA[AdminHome]]></class_name>
+      <class_name>AdminHome</class_name>
     </tab>
     <tab id="Shops" id_parent="">
-			<class_name><![CDATA[AdminShop]]></class_name>
+      <class_name>AdminShop</class_name>
     </tab>
     <tab id="Group_Shops" id_parent="Shops">
-			<class_name><![CDATA[AdminGroupShop]]></class_name>
+      <class_name>AdminGroupShop</class_name>
     </tab>
     <tab id="Shop_Urls" id_parent="Shops">
-			<class_name><![CDATA[AdminShopUrl]]></class_name>
+      <class_name>AdminShopUrl</class_name>
     </tab>
     <tab id="Genders" id_parent="Customers">
-			<class_name><![CDATA[AdminGenders]]></class_name>
+      <class_name>AdminGenders</class_name>
     </tab>
     <tab id="SQL_Manager" id_parent="Tools">
-			<class_name><![CDATA[AdminRequestSql]]></class_name>
+      <class_name>AdminRequestSql</class_name>
     </tab>
     <tab id="Products_1" id_parent="Catalog">
-			<class_name><![CDATA[AdminProducts]]></class_name>
+      <class_name>AdminProducts</class_name>
     </tab>
     <tab id="Categories" id_parent="Catalog">
-			<class_name><![CDATA[AdminCategories]]></class_name>
+      <class_name>AdminCategories</class_name>
     </tab>
     <tab id="tab_95" id_parent="">
-			<class_name><![CDATA[AdminStock]]></class_name>
+      <class_name>AdminStock</class_name>
     </tab>
     <tab id="Warehouses" id_parent="tab_95">
-			<class_name><![CDATA[AdminWarehouses]]></class_name>
+      <class_name>AdminWarehouses</class_name>
     </tab>
     <tab id="Stock_Management" id_parent="tab_95">
-			<class_name><![CDATA[AdminStockManagement]]></class_name>
+      <class_name>AdminStockManagement</class_name>
     </tab>
     <tab id="Stock_instant_state" id_parent="tab_95">
-			<class_name><![CDATA[AdminStockInstantState]]></class_name>
+      <class_name>AdminStockInstantState</class_name>
     </tab>
     <tab id="Stock_cover" id_parent="tab_95">
-			<class_name><![CDATA[AdminStockCover]]></class_name>
+      <class_name>AdminStockCover</class_name>
     </tab>
-		<tab id="Supplier_orders" id_parent="tab_95">
+    <tab id="Supply_orders" id_parent="tab_95">
-			<class_name><![CDATA[AdminSupplierOrders]]></class_name>
+      <class_name>AdminSupplyOrders</class_name>
     </tab>
-		<tab id="Combinations_generator" id_parent="">
+    <tab id="Combinations_generator" id_parent="-1">
-			<class_name><![CDATA[AdminAttributeGenerator]]></class_name>
+      <class_name>AdminAttributeGenerator</class_name>
     </tab>
     <tab id="Accounting" id_parent="">
-			<class_name><![CDATA[AdminAccounting]]></class_name>
+      <class_name>AdminAccounting</class_name>
     </tab>
     <tab id="Account_Number_Management" id_parent="Accounting">
-			<class_name><![CDATA[AdminAccountingManagement]]></class_name>
+      <class_name>AdminAccountingManagement</class_name>
     </tab>
     <tab id="Export" id_parent="Accounting">
-			<class_name><![CDATA[AdminAccountingExport]]></class_name>
+      <class_name>AdminAccountingExport</class_name>
+    </tab>
+    <tab id="CMS_categories" id_parent="-1">
+      <class_name>AdminCmsCategories</class_name>
+    </tab>
+    <tab id="CMS_pages" id_parent="-1">
+      <class_name>AdminCms</class_name>
+    </tab>
+    <tab id="tab_107" id_parent="-1">
+      <class_name>AdminLogin</class_name>
+    </tab>
+    <tab id="Configuration" id_parent="tab_95">
+      <class_name>AdminStockConfiguration</class_name>
+    </tab>
+    <tab id="Catalog_price_rules" id_parent="Catalog">
+      <class_name>AdminSpecificPriceRule</class_name>
     </tab>
   </entities>
 </entity_tab>

install-new/data/xml/theme.xml

@@ -3,10 +3,9 @@
   <fields id="name" class="Theme">
     <field name="name"/>
   </fields>
-
   <entities>
-		<theme id="prestashop">
+    <theme id="default">
-			<name><![CDATA[prestashop]]></name>
+      <name>default</name>
     </theme>
   </entities>
 </entity_theme>

install-new/data/xml/timezone.xml

@@ -3,7 +3,6 @@
   <fields id="name">
     <field name="name"/>
   </fields>
-
   <entities>
     <timezone id="Africa_Abidjan" name="Africa/Abidjan"/>
     <timezone id="Africa_Accra" name="Africa/Accra"/>

install-new/data/xml/warehouse.xml

@@ -8,8 +8,5 @@
     <field name="name"/>
     <field name="management_type"/>
   </fields>
-
+  <entities/>
-	<entities>
-		<warehouse id="default_warehouse" id_currency="1" id_address="" id_employee="employee_1" reference="default_warehouse" name="default warehouse" management_type="WA" />
-	</entities>
 </entity_warehouse>

install-new/data/xml/web_browser.xml

@@ -3,31 +3,30 @@
   <fields id="name">
     <field name="name"/>
   </fields>
-
   <entities>
     <web_browser id="Safari">
-			<name><![CDATA[Safari]]></name>
+      <name>Safari</name>
     </web_browser>
     <web_browser id="Firefox_2_x">
-			<name><![CDATA[Firefox 2.x]]></name>
+      <name>Firefox 2.x</name>
     </web_browser>
     <web_browser id="Firefox_3_x">
-			<name><![CDATA[Firefox 3.x]]></name>
+      <name>Firefox 3.x</name>
     </web_browser>
     <web_browser id="Opera">
-			<name><![CDATA[Opera]]></name>
+      <name>Opera</name>
     </web_browser>
     <web_browser id="IE_6_x">
-			<name><![CDATA[IE 6.x]]></name>
+      <name>IE 6.x</name>
     </web_browser>
     <web_browser id="IE_7_x">
-			<name><![CDATA[IE 7.x]]></name>
+      <name>IE 7.x</name>
     </web_browser>
     <web_browser id="IE_8_x">
-			<name><![CDATA[IE 8.x]]></name>
+      <name>IE 8.x</name>
     </web_browser>
     <web_browser id="Google_Chrome">
-			<name><![CDATA[Google Chrome]]></name>
+      <name>Google Chrome</name>
     </web_browser>
   </entities>
 </entity_web_browser>

install-new/data/xml/zone.xml

@@ -4,31 +4,30 @@
     <field name="name"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <zone id="Europe" active="1">
-			<name><![CDATA[Europe]]></name>
+      <name>Europe</name>
     </zone>
     <zone id="North_America" active="1">
-			<name><![CDATA[North America]]></name>
+      <name>North America</name>
     </zone>
     <zone id="Asia" active="1">
-			<name><![CDATA[Asia]]></name>
+      <name>Asia</name>
     </zone>
     <zone id="Africa" active="1">
-			<name><![CDATA[Africa]]></name>
+      <name>Africa</name>
     </zone>
     <zone id="Oceania" active="1">
-			<name><![CDATA[Oceania]]></name>
+      <name>Oceania</name>
     </zone>
     <zone id="South_America" active="1">
-			<name><![CDATA[South America]]></name>
+      <name>South America</name>
     </zone>
     <zone id="Europe_out_E_U" active="1">
-			<name><![CDATA[Europe (out E.U)]]></name>
+      <name>Europe (out E.U)</name>
     </zone>
     <zone id="Centrale_America_Antilla" active="1">
-			<name><![CDATA[Centrale America/Antilla]]></name>
+      <name>Centrale America/Antilla</name>
     </zone>
   </entities>
 </entity_zone>

install-new/fixtures/apple/data/access.xml

@@ -8,7 +8,6 @@
     <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"/>
@@ -57,7 +56,6 @@
     <access id="access_2_47" id_profile="Administrator" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_48" id_profile="Administrator" id_tab="PDF" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_49" id_profile="Administrator" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_2_51" id_profile="Administrator" id_tab="Settings" view="1" add="1" edit="1" delete="1" />
     <access id="access_2_52" id_profile="Administrator" id_tab="Subdomains" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_53" id_profile="Administrator" id_tab="DB_Backup" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_54" id_profile="Administrator" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
@@ -100,11 +98,16 @@
     <access id="access_2_97" id_profile="Administrator" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_98" id_profile="Administrator" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_99" id_profile="Administrator" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_2_100" id_profile="Administrator" id_tab="Supplier_orders" view="1" add="1" edit="1" delete="1" />
+    <access id="access_2_100" id_profile="Administrator" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_101" id_profile="Administrator" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_102" id_profile="Administrator" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_103" id_profile="Administrator" id_tab="Account_Number_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_104" id_profile="Administrator" id_tab="Export" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_105" id_profile="Administrator" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_106" id_profile="Administrator" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_107" id_profile="Administrator" id_tab="tab_107" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_108" id_profile="Administrator" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_109" id_profile="Administrator" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_1" id_profile="Logistician" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_2" id_profile="Logistician" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_3" id_profile="Logistician" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
@@ -152,7 +155,7 @@
     <access id="access_3_47" id_profile="Logistician" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_48" id_profile="Logistician" id_tab="PDF" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_49" id_profile="Logistician" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_3_51" id_profile="Logistician" id_tab="Settings" view="0" add="0" edit="0" delete="0" />
+    <access id="access_3_51" id_profile="Logistician" id_tab="51" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_52" id_profile="Logistician" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_53" id_profile="Logistician" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_54" id_profile="Logistician" id_tab="Order_Messages" view="0" add="0" edit="0" delete="0"/>
@@ -184,15 +187,24 @@
     <access id="access_3_86" id_profile="Logistician" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_87" id_profile="Logistician" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_88" id_profile="Logistician" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
-		<access id="access_3_89" id_profile="Logistician" id_tab="Group_Shops" view="0" add="0" edit="0" delete="0" />
     <access id="access_3_90" id_profile="Logistician" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_91" id_profile="Logistician" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_92" id_profile="Logistician" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_93" id_profile="Logistician" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_94" id_profile="Logistician" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_95" id_profile="Logistician" id_tab="tab_95" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_96" id_profile="Logistician" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_97" id_profile="Logistician" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_98" id_profile="Logistician" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_99" id_profile="Logistician" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_100" id_profile="Logistician" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_101" id_profile="Logistician" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_102" id_profile="Logistician" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_103" id_profile="Logistician" id_tab="Account_Number_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_104" id_profile="Logistician" id_tab="Export" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_105" id_profile="Logistician" id_tab="CMS_categories" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_106" id_profile="Logistician" id_tab="CMS_pages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_108" id_profile="Logistician" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
     <access id="access_4_1" id_profile="Translator" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_4_2" id_profile="Translator" id_tab="Customers" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_3" id_profile="Translator" id_tab="Orders" view="0" add="0" edit="0" delete="0"/>
@@ -240,7 +252,7 @@
     <access id="access_4_47" id_profile="Translator" id_tab="Merchandise_Returns" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_48" id_profile="Translator" id_tab="PDF" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_49" id_profile="Translator" id_tab="Credit_Slips" view="0" add="0" edit="0" delete="0"/>
-		<access id="access_4_51" id_profile="Translator" id_tab="Settings" view="0" add="0" edit="0" delete="0" />
+    <access id="access_4_51" id_profile="Translator" id_tab="51" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_52" id_profile="Translator" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_53" id_profile="Translator" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_54" id_profile="Translator" id_tab="Order_Messages" view="0" add="0" edit="0" delete="0"/>
@@ -276,11 +288,21 @@
     <access id="access_4_90" id_profile="Translator" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_91" id_profile="Translator" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_92" id_profile="Translator" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_93" id_profile="Translator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_94" id_profile="Translator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
     <access id="access_4_95" id_profile="Translator" id_tab="tab_95" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_96" id_profile="Translator" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_97" id_profile="Translator" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_98" id_profile="Translator" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_99" id_profile="Translator" id_tab="Stock_cover" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_100" id_profile="Translator" id_tab="Supply_orders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_101" id_profile="Translator" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_102" id_profile="Translator" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_103" id_profile="Translator" id_tab="Account_Number_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_104" id_profile="Translator" id_tab="Export" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_105" id_profile="Translator" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_106" id_profile="Translator" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_108" id_profile="Translator" id_tab="Configuration" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_1" id_profile="Salesman" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_5_2" id_profile="Salesman" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
     <access id="access_5_3" id_profile="Salesman" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
@@ -328,7 +350,7 @@
     <access id="access_5_47" id_profile="Salesman" id_tab="Merchandise_Returns" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_48" id_profile="Salesman" id_tab="PDF" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_49" id_profile="Salesman" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
-		<access id="access_5_51" id_profile="Salesman" id_tab="Settings" view="0" add="0" edit="0" delete="0" />
+    <access id="access_5_51" id_profile="Salesman" id_tab="51" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_52" id_profile="Salesman" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_53" id_profile="Salesman" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_54" id_profile="Salesman" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
@@ -364,10 +386,20 @@
     <access id="access_5_90" id_profile="Salesman" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_91" id_profile="Salesman" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_92" id_profile="Salesman" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
-		<access id="access_5_95" id_profile="Salesman" id_tab="tab_95" view="0" add="0" edit="0" delete="0" />
+    <access id="access_5_93" id_profile="Salesman" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_94" id_profile="Salesman" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_95" id_profile="Salesman" id_tab="tab_95" view="1" add="0" edit="0" delete="0"/>
     <access id="access_5_96" id_profile="Salesman" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_97" id_profile="Salesman" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_98" id_profile="Salesman" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_99" id_profile="Salesman" id_tab="Stock_cover" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_100" id_profile="Salesman" id_tab="Supply_orders" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_101" id_profile="Salesman" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_102" id_profile="Salesman" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_103" id_profile="Salesman" id_tab="Account_Number_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_104" id_profile="Salesman" id_tab="Export" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_105" id_profile="Salesman" id_tab="CMS_categories" view="0" add="0" edit="0" delete="0"/>
+    <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>
 </entity_access>

install-new/fixtures/apple/data/address.xml

@@ -6,6 +6,7 @@
     <field name="id_customer" relation="customer"/>
     <field name="id_manufacturer" relation="manufacturer"/>
     <field name="id_supplier" relation="supplier"/>
+    <field name="id_warehouse"/>
     <field name="alias"/>
     <field name="company"/>
     <field name="lastname"/>
@@ -21,19 +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="" alias="manufacturer" company="" lastname="JOBS" firstname="STEVE" postcode="95014" phone="(800) 275-2273" phone_mobile="" vat_number="" dni="" active="1">
+    <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><![CDATA[1 Infinite Loop]]></address1>
+      <address1>1 Infinite Loop</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[Cupertino]]></city>
+      <city>Cupertino</city>
-			<other><![CDATA[]]></other>
+      <other/>
     </address>
-		<address id="Mon_adresse" id_country="FR" id_state="" id_customer="John" id_manufacturer="" id_supplier="" alias="Mon adresse" company="My Company" lastname="DOE" firstname="John" postcode="75000" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
+    <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><![CDATA[16, Main street]]></address1>
+      <address1>16, Main street</address1>
-			<address2><![CDATA[2nd floor]]></address2>
+      <address2>2nd floor</address2>
-			<city><![CDATA[Paris ]]></city>
+      <city>Paris </city>
-			<other><![CDATA[]]></other>
+      <other/>
     </address>
   </entities>
 </entity_address>

install-new/fixtures/apple/data/alias.xml

@@ -5,15 +5,14 @@
     <field name="search"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <alias id="ipdo" active="1">
-			<alias><![CDATA[ipdo]]></alias>
+      <alias>ipdo</alias>
-			<search><![CDATA[ipod]]></search>
+      <search>ipod</search>
     </alias>
     <alias id="piod" active="1">
-			<alias><![CDATA[piod]]></alias>
+      <alias>piod</alias>
-			<search><![CDATA[ipod]]></search>
+      <search>ipod</search>
     </alias>
   </entities>
 </entity_alias>

install-new/fixtures/apple/data/attribute.xml

@@ -4,7 +4,6 @@
     <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=""/>

install-new/fixtures/apple/data/attribute_group.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/carrier.xml

@@ -8,19 +8,20 @@
     <field name="active"/>
     <field name="shipping_handling"/>
     <field name="range_behavior"/>
-		<field name="is_module" />
     <field name="is_free"/>
     <field name="shipping_external"/>
     <field name="need_range"/>
-		<field name="external_module_name" />
     <field name="shipping_method"/>
+    <field name="max_width"/>
+    <field name="max_height"/>
+    <field name="max_depth"/>
+    <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_module="0" is_free="0" shipping_external="0" need_range="0" shipping_method="0">
+    <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><![CDATA[My carrier]]></name>
+      <name>My carrier</name>
-			<url><![CDATA[]]></url>
+      <url/>
-			<external_module_name><![CDATA[]]></external_module_name>
     </carrier>
   </entities>
 </entity_carrier>

install-new/fixtures/apple/data/carrier_group.xml

@@ -2,10 +2,11 @@
 <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" />
+    <field name="id_group" relation="group"/>
   </fields>
-
   <entities>
-		<carrier_group id="carrier_group_2_1" id_carrier="My_carrier" id_group="1" />
+    <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>
 </entity_carrier_group>

install-new/fixtures/apple/data/carrier_zone.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/cart.xml

@@ -2,6 +2,7 @@
 <entity_cart>
   <fields class="Cart">
     <field name="id_carrier" relation="carrier"/>
+    <field name="delivery_option"/>
     <field name="id_address_delivery" relation="address"/>
     <field name="id_address_invoice" relation="address"/>
     <field name="id_currency"/>
@@ -11,11 +12,12 @@
     <field name="recyclable"/>
     <field name="gift"/>
     <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">
+    <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">
-			<gift_message><![CDATA[]]></gift_message>
+      <delivery_option/>
+      <gift_message/>
     </cart>
   </entities>
 </entity_cart>

install-new/fixtures/apple/data/cart_product.xml

@@ -3,12 +3,12 @@
   <fields primary="id_cart, id_product, id_product_attribute">
     <field name="id_cart" relation="cart"/>
     <field name="id_product" relation="product"/>
+    <field name="id_address_delivery"/>
     <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_product_attribute="product_attribute_23" quantity="1" />
+    <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_product_attribute="" 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>

install-new/fixtures/apple/data/category.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_category>
-	<fields id="name" class="Category" sql="a.id_category &gt; 1" image="c">
+  <fields id="name" class="Category" sql="a.id_category &gt; 1">
     <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"/>

install-new/fixtures/apple/data/category_product.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/connections.xml

@@ -6,10 +6,9 @@
     <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><![CDATA[http://www.prestashop.com]]></http_referer>
+      <http_referer>http://www.prestashop.com</http_referer>
     </connections>
   </entities>
 </entity_connections>

install-new/fixtures/apple/data/customer.xml

@@ -18,11 +18,10 @@
     <field name="active"/>
     <field name="is_guest"/>
   </fields>
-
   <entities>
-		<customer id="John" id_gender="Mr" id_default_group="1" firstname="John" lastname="DOE" passwd="6ea6348c35235868c97129412d7e4f0f" last_passwd_gen="2011-11-09 13:25:32" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
+    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="ed2748bb0c8af6b7265f757f57d42d1a" last_passwd_gen="2011-12-21 19:11:28" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
-			<email><![CDATA[pub@prestashop.com]]></email>
+      <email>pub@prestashop.com</email>
-			<note><![CDATA[]]></note>
+      <note/>
     </customer>
   </entities>
 </entity_customer>

install-new/fixtures/apple/data/delivery.xml

@@ -7,7 +7,6 @@
     <field name="id_zone" relation="zone"/>
     <field name="price"/>
   </fields>
-
   <entities>
     <delivery id="delivery_1" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="Europe" price="5.000000"/>
     <delivery id="delivery_2" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="North_America" price="5.000000"/>

install-new/fixtures/apple/data/feature.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_feature>
-	<fields id="name" class="Feature">
+  <fields id="name" class="Feature"/>
-	</fields>
-
   <entities>
     <feature id="Height"/>
     <feature id="Width"/>

install-new/fixtures/apple/data/feature_value.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/guest.xml

@@ -16,7 +16,6 @@
     <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>

install-new/fixtures/apple/data/image.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/manufacturer.xml

@@ -4,13 +4,12 @@
     <field name="name"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <manufacturer id="Apple_Computer_Inc" active="1">
-			<name><![CDATA[Apple Computer, Inc]]></name>
+      <name>Apple Computer, Inc</name>
     </manufacturer>
     <manufacturer id="Shure_Incorporated" active="1">
-			<name><![CDATA[Shure Incorporated]]></name>
+      <name>Shure Incorporated</name>
     </manufacturer>
   </entities>
 </entity_manufacturer>

install-new/fixtures/apple/data/order_detail.xml

@@ -2,6 +2,8 @@
 <entity_order_detail>
   <fields class="OrderDetail">
     <field name="id_order" relation="orders"/>
+    <field name="id_order_invoice"/>
+    <field name="id_warehouse"/>
     <field name="product_id" relation="product"/>
     <field name="product_attribute_id" relation="product_attribute"/>
     <field name="product_name"/>
@@ -13,6 +15,8 @@
     <field name="product_price"/>
     <field name="reduction_percent"/>
     <field name="reduction_amount"/>
+    <field name="reduction_amount_tax_incl"/>
+    <field name="reduction_amount_tax_excl"/>
     <field name="group_reduction"/>
     <field name="product_quantity_discount"/>
     <field name="product_ean13"/>
@@ -20,25 +24,32 @@
     <field name="product_reference"/>
     <field name="product_supplier_reference"/>
     <field name="product_weight"/>
+    <field name="tax_computation_method"/>
     <field name="tax_name"/>
     <field name="tax_rate"/>
-		<field name="tax_computation_method" />
     <field name="ecotax"/>
     <field name="ecotax_tax_rate"/>
     <field name="discount_quantity_applied"/>
     <field name="download_hash"/>
     <field name="download_nb"/>
     <field name="download_deadline"/>
+    <field name="total_price_tax_incl"/>
+    <field name="total_price_tax_excl"/>
+    <field name="unit_price_tax_incl"/>
+    <field name="unit_price_tax_excl"/>
+    <field name="total_shipping_price_tax_incl"/>
+    <field name="total_shipping_price_tax_excl"/>
+    <field name="purchase_supplier_price"/>
+    <field name="original_product_price"/>
   </fields>
-
   <entities>
-		<order_detail id="order_detail_1" id_order="" 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" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_name="" tax_rate="0.000" tax_computation_method="0" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00">
+    <order_detail id="order_detail_1" id_order="1" id_order_invoice="" id_warehouse="0" product_id="iPod_touch" product_attribute_id="product_attribute_23" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="392.140500" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0" reduction_amount_tax_excl="0" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="469.000000" total_price_tax_excl="392.140000" unit_price_tax_incl="469.000000" unit_price_tax_excl="392.140468" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
-			<product_name><![CDATA[iPod touch - Capacité: 32Go]]></product_name>
+      <product_name>iPod touch - Capacité: 32Go</product_name>
-			<download_hash><![CDATA[]]></download_hash>
+      <download_hash/>
     </order_detail>
-		<order_detail id="order_detail_2" id_order="" 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" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_name="" tax_rate="0.000" tax_computation_method="0" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00">
+    <order_detail id="order_detail_2" id_order="1" id_order_invoice="" id_warehouse="0" product_id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" product_attribute_id="" product_quantity="1" product_quantity_in_stock="0" product_quantity_refunded="0" product_quantity_return="0" product_quantity_reinjected="0" product_price="124.581900" reduction_percent="0.00" reduction_amount="0.000000" reduction_amount_tax_incl="0" reduction_amount_tax_excl="0" group_reduction="0.00" product_quantity_discount="0.000000" product_ean13="" product_upc="" product_reference="" product_supplier_reference="" product_weight="0" tax_computation_method="0" tax_name="" tax_rate="0.000" ecotax="0.000000" ecotax_tax_rate="0.000" discount_quantity_applied="0" download_nb="0" download_deadline="0000-00-00 00:00:00" total_price_tax_incl="149.000000" total_price_tax_excl="124.580000" unit_price_tax_incl="149.000000" unit_price_tax_excl="124.581940" total_shipping_price_tax_incl="0.000000" total_shipping_price_tax_excl="0.000000" purchase_supplier_price="0.000000" original_product_price="0.000000">
-			<product_name><![CDATA[Écouteurs à isolation sonore Shure SE210]]></product_name>
+      <product_name>Écouteurs à isolation sonore Shure SE210</product_name>
-			<download_hash><![CDATA[]]></download_hash>
+      <download_hash/>
     </order_detail>
   </entities>
 </entity_order_detail>

install-new/fixtures/apple/data/order_history.xml

@@ -5,8 +5,7 @@
     <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="" id_order_state="Awaiting_cheque_payment" />
+    <order_history id="order_history_1" id_employee="0" id_order="1" id_order_state="Awaiting_cheque_payment"/>
   </entities>
 </entity_order_history>

install-new/fixtures/apple/data/order_message.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_order_message>
-	<fields id="name" class="OrderMessage">
+  <fields id="name" class="OrderMessage"/>
-	</fields>
-
   <entities>
     <order_message id="Delay"/>
   </entities>

install-new/fixtures/apple/data/orders.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_orders>
   <fields primary="id_order" class="Order">
+    <field name="reference"/>
     <field name="id_carrier" relation="carrier"/>
     <field name="id_customer" relation="customer"/>
     <field name="id_cart" relation="cart"/>
@@ -16,25 +17,31 @@
     <field name="gift_message"/>
     <field name="shipping_number"/>
     <field name="total_discounts"/>
+    <field name="total_discounts_tax_incl"/>
     <field name="total_paid"/>
+    <field name="total_paid_tax_incl"/>
+    <field name="total_paid_tax_excl"/>
     <field name="total_paid_real"/>
     <field name="total_products"/>
     <field name="total_products_wt"/>
     <field name="total_shipping"/>
+    <field name="total_shipping_tax_incl"/>
+    <field name="total_shipping_tax_excl"/>
     <field name="carrier_tax_rate"/>
     <field name="total_wrapping"/>
+    <field name="total_wrapping_tax_incl"/>
+    <field name="total_wrapping_tax_excl"/>
     <field name="invoice_number"/>
     <field name="delivery_number"/>
     <field name="invoice_date"/>
     <field name="delivery_date"/>
     <field name="valid"/>
   </fields>
-
   <entities>
-		<orders id="orders_1" 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_paid="625.98" total_paid_real="625.98" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" carrier_tax_rate="0.000" total_wrapping="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">
+    <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><![CDATA[Chèque]]></payment>
+      <payment>Chèque</payment>
-			<module><![CDATA[cheque]]></module>
+      <module>cheque</module>
-			<gift_message><![CDATA[]]></gift_message>
+      <gift_message/>
     </orders>
   </entities>
 </entity_orders>

install-new/fixtures/apple/data/product.xml

@@ -39,36 +39,36 @@
     <field name="cache_has_attachments"/>
     <field name="is_virtual"/>
     <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <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="">
+    <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><![CDATA[]]></unity>
+      <unity/>
-			<location><![CDATA[]]></location>
+      <location/>
     </product>
   </entities>
 </entity_product>

install-new/fixtures/apple/data/product_attribute.xml

@@ -17,88 +17,87 @@
     <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><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_8" id_product="iPod_shuffle" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="20" weight="0" unit_price_impact="0.00" default_on="1" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_9" id_product="iPod_shuffle" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="30" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_10" id_product="iPod_shuffle" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="40" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_12" id_product="MacBook_Air" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="751.672241" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_13" id_product="MacBook_Air" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="1" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_14" id_product="MacBook_Air" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="225.752508" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_15" id_product="MacBook_Air" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="977.424749" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_19" id_product="iPod_touch" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="1" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_22" id_product="iPod_touch" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="75.250836" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_23" id_product="iPod_touch" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="150.501672" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_25" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="4" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_26" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_27" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_28" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_29" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_30" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_31" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="1" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_32" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_33" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_34" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_35" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_36" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_39" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_40" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_41" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="41.806020" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
     <product_attribute id="product_attribute_42" id_product="iPod_Nano" reference="" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0" unit_price_impact="0.00" default_on="0" minimal_quantity="1" available_date="0000-00-00">
-			<location><![CDATA[]]></location>
+      <location/>
     </product_attribute>
   </entities>
 </entity_product_attribute>

install-new/fixtures/apple/data/product_attribute_combination.xml

@@ -4,7 +4,6 @@
     <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"/>

install-new/fixtures/apple/data/product_supplier.xml

@@ -0,0 +1,46 @@
+<?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"/>
+    <product_supplier id="product_supplier_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_18" id_product="MacBook_Air" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_19" id_product="MacBook_Air" id_product_attribute="product_attribute_12" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_24" id_product="iPod_shuffle" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_25" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_30" id_product="MacBook" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_31" id_product="iPod_touch" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_32" id_product="iPod_touch" id_product_attribute="product_attribute_19" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <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>
+</entity_product_supplier>

install-new/fixtures/apple/data/profile.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_profile>
-	<fields id="name" class="Profile" sql="a.id_profile &gt; 1">
+  <fields id="name" class="Profile" sql="a.id_profile &gt; 1"/>
-	</fields>
-
   <entities>
     <profile id="Administrator"/>
     <profile id="Logistician"/>

install-new/fixtures/apple/data/range_price.xml

@@ -5,7 +5,6 @@
     <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>

install-new/fixtures/apple/data/range_weight.xml

@@ -5,7 +5,6 @@
     <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>

install-new/fixtures/apple/data/scene.xml

@@ -3,7 +3,6 @@
   <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"/>

install-new/fixtures/apple/data/specific_price.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<entity_specific_price>
+  <fields class="SpecificPrice">
+    <field name="id_cart" relation="cart"/>
+    <field name="id_product" relation="product"/>
+    <field name="id_shop"/>
+    <field name="id_group_shop"/>
+    <field name="id_currency"/>
+    <field name="id_country" relation="country"/>
+    <field name="id_group" relation="group"/>
+    <field name="id_customer" relation="customer"/>
+    <field name="id_product_attribute" relation="product_attribute"/>
+    <field name="price"/>
+    <field name="from_quantity"/>
+    <field name="reduction"/>
+    <field name="reduction_type"/>
+    <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>

install-new/fixtures/apple/data/stock_available.xml

@@ -7,37 +7,40 @@
     <field name="depends_on_stock"/>
     <field name="out_of_stock"/>
   </fields>
-
   <entities>
-		<stock_available id="stock_available_1" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" quantity="10" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_1" id_product="iPod_Nano" id_product_attribute="product_attribute_25" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_2" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" quantity="20" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_2" id_product="iPod_Nano" id_product_attribute="" quantity="160" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_3" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" quantity="30" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_4" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" quantity="40" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_5" id_product="MacBook_Air" id_product_attribute="product_attribute_12" quantity="100" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_6" id_product="MacBook_Air" id_product_attribute="product_attribute_13" quantity="99" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_7" id_product="MacBook_Air" id_product_attribute="product_attribute_14" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_8" id_product="MacBook_Air" id_product_attribute="product_attribute_15" quantity="25" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_9" id_product="iPod_touch" id_product_attribute="product_attribute_19" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_10" id_product="iPod_touch" id_product_attribute="product_attribute_22" quantity="60" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_11" id_product="iPod_touch" id_product_attribute="product_attribute_23" quantity="70" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_12" id_product="iPod_Nano" id_product_attribute="product_attribute_25" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_13" id_product="iPod_Nano" id_product_attribute="product_attribute_26" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_14" id_product="iPod_Nano" id_product_attribute="product_attribute_27" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_15" id_product="iPod_Nano" id_product_attribute="product_attribute_28" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_16" id_product="iPod_Nano" id_product_attribute="product_attribute_29" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_17" id_product="iPod_Nano" id_product_attribute="product_attribute_30" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" quantity="10" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_18" id_product="iPod_Nano" id_product_attribute="product_attribute_31" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_18" id_product="MacBook_Air" id_product_attribute="product_attribute_12" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_19" id_product="iPod_Nano" id_product_attribute="product_attribute_32" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_19" id_product="MacBook_Air" id_product_attribute="" quantity="400" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_20" id_product="iPod_Nano" id_product_attribute="product_attribute_33" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_21" id_product="iPod_Nano" id_product_attribute="product_attribute_34" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_22" id_product="iPod_Nano" id_product_attribute="product_attribute_35" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" quantity="100" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_23" id_product="iPod_Nano" id_product_attribute="product_attribute_36" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" quantity="25" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_24" id_product="iPod_Nano" id_product_attribute="product_attribute_39" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_24" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_25" id_product="iPod_Nano" id_product_attribute="product_attribute_40" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_25" id_product="iPod_shuffle" id_product_attribute="" quantity="120" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_26" id_product="iPod_Nano" id_product_attribute="product_attribute_41" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_27" id_product="iPod_Nano" id_product_attribute="product_attribute_42" quantity="50" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_28" id_product="MacBook" id_product_attribute="" quantity="4" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" quantity="30" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_29" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" quantity="8" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_29" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" quantity="15" depends_on_stock="0" out_of_stock="0"/>
-		<stock_available id="stock_available_30" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" quantity="15" depends_on_stock="0" out_of_stock="2" />
+    <stock_available id="stock_available_30" id_product="MacBook" id_product_attribute="" quantity="75" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_31" id_product="iPod_touch" id_product_attribute="product_attribute_19" quantity="40" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_32" id_product="iPod_touch" id_product_attribute="" quantity="120" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" quantity="40" depends_on_stock="0" out_of_stock="0"/>
+    <stock_available id="stock_available_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" quantity="40" depends_on_stock="0" out_of_stock="0"/>
   </entities>
 </entity_stock_available>

install-new/fixtures/apple/data/store.xml

@@ -17,52 +17,51 @@
     <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><![CDATA[Dade County]]></name>
+      <name>Dade County</name>
-			<address1><![CDATA[3030 SW 8th St Miami]]></address1>
+      <address1>3030 SW 8th St Miami</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[Miami]]></city>
+      <city>Miami</city>
-			<hours><![CDATA[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>
+      <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><![CDATA[]]></email>
+      <email/>
-			<note><![CDATA[]]></note>
+      <note/>
     </store>
     <store id="E_Fort_Lauderdale" id_country="US" id_state="FL" postcode=" 33304" latitude="26.13793600" longitude="-80.13943500" phone="" fax="" active="1">
-			<name><![CDATA[E Fort Lauderdale]]></name>
+      <name>E Fort Lauderdale</name>
-			<address1><![CDATA[1000 Northeast 4th Ave Fort Lauderdale]]></address1>
+      <address1>1000 Northeast 4th Ave Fort Lauderdale</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[Miami]]></city>
+      <city>Miami</city>
-			<hours><![CDATA[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>
+      <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><![CDATA[]]></email>
+      <email/>
-			<note><![CDATA[]]></note>
+      <note/>
     </store>
     <store id="Pembroke_Pines" id_country="US" id_state="FL" postcode="33026" latitude="26.00998700" longitude="-80.29447200" phone="" fax="" active="1">
-			<name><![CDATA[Pembroke Pines]]></name>
+      <name>Pembroke Pines</name>
-			<address1><![CDATA[11001 Pines Blvd Pembroke Pines]]></address1>
+      <address1>11001 Pines Blvd Pembroke Pines</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[Miami]]></city>
+      <city>Miami</city>
-			<hours><![CDATA[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>
+      <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><![CDATA[]]></email>
+      <email/>
-			<note><![CDATA[]]></note>
+      <note/>
     </store>
     <store id="Coconut_Grove" id_country="US" id_state="FL" postcode=" 33133" latitude="25.73629600" longitude="-80.24479700" phone="" fax="" active="1">
-			<name><![CDATA[Coconut Grove]]></name>
+      <name>Coconut Grove</name>
-			<address1><![CDATA[2999 SW 32nd Avenue]]></address1>
+      <address1>2999 SW 32nd Avenue</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[ Miami]]></city>
+      <city> Miami</city>
-			<hours><![CDATA[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>
+      <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><![CDATA[]]></email>
+      <email/>
-			<note><![CDATA[]]></note>
+      <note/>
     </store>
     <store id="N_Miami_Biscayne" id_country="US" id_state="FL" postcode="33181" latitude="25.88674000" longitude="-80.16329200" phone="" fax="" active="1">
-			<name><![CDATA[N Miami/Biscayne]]></name>
+      <name>N Miami/Biscayne</name>
-			<address1><![CDATA[12055 Biscayne Blvd]]></address1>
+      <address1>12055 Biscayne Blvd</address1>
-			<address2><![CDATA[]]></address2>
+      <address2/>
-			<city><![CDATA[Miami]]></city>
+      <city>Miami</city>
-			<hours><![CDATA[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>
+      <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><![CDATA[]]></email>
+      <email/>
-			<note><![CDATA[]]></note>
+      <note/>
     </store>
   </entities>
 </entity_store>

install-new/fixtures/apple/data/supplier.xml

@@ -4,13 +4,12 @@
     <field name="name"/>
     <field name="active"/>
   </fields>
-
   <entities>
     <supplier id="AppleStore" active="1">
-			<name><![CDATA[AppleStore]]></name>
+      <name>AppleStore</name>
     </supplier>
     <supplier id="Shure_Online_Store" active="1">
-			<name><![CDATA[Shure Online Store]]></name>
+      <name>Shure Online Store</name>
     </supplier>
   </entities>
 </entity_supplier>

install-new/fixtures/apple/data/tag.xml

@@ -3,7 +3,5 @@
   <fields>
     <field name="name" relation="product"/>
   </fields>
-
+  <entities/>
-	<entities>
-	</entities>
 </entity_tag>

install-new/fixtures/apple/langs/de/data/attribute.xml

@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <entity_attribute>
   <attribute id="2GB">
-		<name><![CDATA[2GB]]></name>
+    <name>2GB</name>
   </attribute>
   <attribute id="4GB">
-		<name><![CDATA[4GB]]></name>
+    <name>4GB</name>
   </attribute>
   <attribute id="Metal">
-		<name><![CDATA[Metallic]]></name>
+    <name>Metallic</name>
   </attribute>
   <attribute id="Blue">
-		<name><![CDATA[Blau]]></name>
+    <name>Blau</name>
   </attribute>
   <attribute id="Pink">
-		<name><![CDATA[Pink]]></name>
+    <name>Pink</name>
   </attribute>
   <attribute id="Green">
-		<name><![CDATA[Grün]]></name>
+    <name>Gr&#xFC;n</name>
   </attribute>
   <attribute id="Orange">
-		<name><![CDATA[Orange]]></name>
+    <name>Orange</name>
   </attribute>
   <attribute id="Optional_64GB_solid-state_drive">
-		<name><![CDATA[Optionale 64 GB Solid-State-Drive]]></name>
+    <name>Optionale 64 GB Solid-State-Drive</name>
   </attribute>
   <attribute id="80GB_Parallel_ATA_Drive_4200_rpm">
-		<name><![CDATA[Parallele ATA 80GB Drive @ 4200 rpm]]></name>
+    <name>Parallele ATA 80GB Drive @ 4200 rpm</name>
   </attribute>
   <attribute id="1_60GHz_Intel_Core_2_Duo">
-		<name><![CDATA[1.60GHz Intel Core 2 Duo]]></name>
+    <name>1.60GHz Intel Core 2 Duo</name>
   </attribute>
   <attribute id="1_80GHz_Intel_Core_2_Duo">
-		<name><![CDATA[1.80GHz Intel Core 2 Duo]]></name>
+    <name>1.80GHz Intel Core 2 Duo</name>
   </attribute>
   <attribute id="80GB_20_000_Songs">
-		<name><![CDATA[80GB: 20.000 Songs]]></name>
+    <name>80GB: 20.000 Songs</name>
   </attribute>
   <attribute id="160GB_40_000_Songs">
-		<name><![CDATA[160GB: 40.000 Songs]]></name>
+    <name>160GB: 40.000 Songs</name>
   </attribute>
   <attribute id="Black">
-		<name><![CDATA[Schwarz]]></name>
+    <name>Schwarz</name>
   </attribute>
   <attribute id="8Go">
-		<name><![CDATA[8Go]]></name>
+    <name>8Go</name>
   </attribute>
   <attribute id="16Go">
-		<name><![CDATA[16Go]]></name>
+    <name>16Go</name>
   </attribute>
   <attribute id="32Go">
-		<name><![CDATA[32Go]]></name>
+    <name>32Go</name>
   </attribute>
   <attribute id="Purple">
-		<name><![CDATA[Violett]]></name>
+    <name>Violett</name>
   </attribute>
   <attribute id="Yellow">
-		<name><![CDATA[Gelb]]></name>
+    <name>Gelb</name>
   </attribute>
   <attribute id="Red">
-		<name><![CDATA[Rot]]></name>
+    <name>Rot</name>
   </attribute>
 </entity_attribute>

install-new/fixtures/apple/langs/de/data/attribute_group.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <entity_attribute_group>
   <attribute_group id="Disk_space">
-		<name><![CDATA[Speicherplatz]]></name>
+    <name>Speicherplatz</name>
-		<public_name><![CDATA[Disk space]]></public_name>
+    <public_name>Disk space</public_name>
   </attribute_group>
   <attribute_group id="Color">
-		<name><![CDATA[Farbe]]></name>
+    <name>Farbe</name>
-		<public_name><![CDATA[Color]]></public_name>
+    <public_name>Color</public_name>
   </attribute_group>
   <attribute_group id="ICU">
-		<name><![CDATA[ICU]]></name>
+    <name>ICU</name>
-		<public_name><![CDATA[Processor]]></public_name>
+    <public_name>Processor</public_name>
   </attribute_group>
 </entity_attribute_group>

install-new/fixtures/apple/langs/de/data/carrier.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <entity_carrier>
-	<carrier id="My_carrier">
+  <carrier id="My_carrier" id_shop="1">
-		<delay><![CDATA[Zustellung am nächsten Tag!]]></delay>
+    <delay>Zustellung am n&#xE4;chsten Tag!</delay>
   </carrier>
 </entity_carrier>

install-new/fixtures/apple/langs/de/data/category.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <entity_category>
-	<category id="iPods">
+  <category id="iPods" id_shop="1">
-		<name><![CDATA[iPods]]></name>
+    <name>iPods</name>
-		<description><![CDATA[Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.]]></description>
+    <description>Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.</description>
-		<link_rewrite><![CDATA[musik-iPods]]></link_rewrite>
+    <link_rewrite>musik-iPods</link_rewrite>
-		<meta_title><![CDATA[]]></meta_title>
+    <meta_title/>
-		<meta_keywords><![CDATA[]]></meta_keywords>
+    <meta_keywords/>
-		<meta_description><![CDATA[]]></meta_description>
+    <meta_description/>
   </category>
-	<category id="Accessories">
+  <category id="Accessories" id_shop="1">
-		<name><![CDATA[Zubehör]]></name>
+    <name>Zubeh&#xF6;r</name>
-		<description><![CDATA[Wonderful accessories for your iPod]]></description>
+    <description>Wonderful accessories for your iPod</description>
-		<link_rewrite><![CDATA[zubehor-ipod]]></link_rewrite>
+    <link_rewrite>zubehor-ipod</link_rewrite>
-		<meta_title><![CDATA[]]></meta_title>
+    <meta_title/>
-		<meta_keywords><![CDATA[]]></meta_keywords>
+    <meta_keywords/>
-		<meta_description><![CDATA[]]></meta_description>
+    <meta_description/>
   </category>
-	<category id="Laptops">
+  <category id="Laptops" id_shop="1">
-		<name><![CDATA[Laptops]]></name>
+    <name>Laptops</name>
-		<description><![CDATA[The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.]]></description>
+    <description>The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.</description>
-		<link_rewrite><![CDATA[laptops]]></link_rewrite>
+    <link_rewrite>laptops</link_rewrite>
-		<meta_title><![CDATA[Apple laptops]]></meta_title>
+    <meta_title>Apple laptops</meta_title>
-		<meta_keywords><![CDATA[Apple MacBook Air-Laptops]]></meta_keywords>
+    <meta_keywords>Apple MacBook Air-Laptops</meta_keywords>
-		<meta_description><![CDATA[Powerful and chic Apple laptops]]></meta_description>
+    <meta_description>Powerful and chic Apple laptops</meta_description>
   </category>
 </entity_category>

install-new/fixtures/apple/langs/de/data/feature.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <entity_feature>
   <feature id="Height">
-		<name><![CDATA[Höhe]]></name>
+    <name>H&#xF6;he</name>
   </feature>
   <feature id="Width">
-		<name><![CDATA[Breite]]></name>
+    <name>Breite</name>
   </feature>
   <feature id="Depth">
-		<name><![CDATA[Tiefe]]></name>
+    <name>Tiefe</name>
   </feature>
   <feature id="Weight">
-		<name><![CDATA[Gewicht]]></name>
+    <name>Gewicht</name>
   </feature>
   <feature id="Headphone">
-		<name><![CDATA[Kopfhörer]]></name>
+    <name>Kopfh&#xF6;rer</name>
   </feature>
 </entity_feature>