[*] BO : reorganization of admin tabs

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-02 14:44:07 +00:00
parent a32fc0cc5b
commit 0f865fd2d6
74 changed files with 10384 additions and 11234 deletions
@@ -94,12 +94,21 @@
 		<p>
 			<b>{l s='PHP Version'}:</b> {$version.php}
 		</p>
-		<p>
-			<b>{l s='MySQL Version'}:</b> {$version.mysql}
-		</p>
 		{if $apache_instaweb}
 		<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
 		{/if}
+
+		<hr />
+		<h3>{l s='Database information'}</h3>
+		<p>
+			<b>{l s='MySQL Version'}:</b> {$database.version}
+		</p>
+		<p>
+			<b>{l s='MySQL Engine'}:</b> {$database.engine}
+		</p>
+		<p>
+			<b>{l s='Tables prefix'}:</b> {$database.prefix}
+		</p>
 	
 		<hr />
 		<h3>{l s='Store information'}</h3>
@@ -0,0 +1,29 @@
+{*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{$localization_form}
+<br />
+{$localization_options}
@@ -0,0 +1,37 @@
+{*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/options/options.tpl"}
+{block name="start_field_block"}
+	{if $field['type'] == 'maintenance_ip'}
+		<div class="margin-form">
+			{$field['script_ip']}
+			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
+			{$field['link_remove_ip']}
+	{else}
+		<div class="margin-form">
+	{/if}
+{/block}
@@ -0,0 +1,28 @@
+{*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+{extends file="helpers/options/options.tpl"}
+
+{block name="after"}<script type="text/javascript">changeCMSActivationAuthorization();</script>{/block}
@@ -29,11 +29,6 @@
 	{if $field['type'] == 'disabled'}
 		<div class="margin-form">
 			{$field['disabled']}
-	{elseif $field['type'] == 'maintenance_ip'}
-		<div class="margin-form">
-			{$field['script_ip']}
-			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
-			{$field['link_remove_ip']}
 	{else}
 		<div class="margin-form">
 	{/if}
@@ -17,7 +17,7 @@
  'AdminAccountingExportControllerCore' => 'controllers/admin/AdminAccountingExportController.php',
  'AdminAccountingManagementController' => 'override/controllers/admin/AdminAccountingManagementController.php',
  'AdminAccountingManagementControllerCore' => 'controllers/admin/AdminAccountingManagementController.php',
-  'AdminAccountingRegisteredNumberController' => '',
+  'AdminAccountingRegisteredNumberController' => 'override/controllers/admin/AdminAccountingRegisteredNumberController.php',
  'AdminAccountingRegisteredNumberControllerCore' => 'controllers/admin/AdminAccountingRegisteredNumberController.php',
  'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
  'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
@@ -25,8 +25,8 @@
  'AdminAddonsMyAccountControllerCore' => 'controllers/admin/AdminAddonsMyAccountController.php',
  'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
  'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
-  'AdminAliasesController' => 'override/controllers/admin/AdminAliasesController.php',
-  'AdminAliasesControllerCore' => 'controllers/admin/AdminAliasesController.php',
+  'AdminAdminPreferencesController' => 'override/controllers/admin/AdminAdminPreferencesController.php',
+  'AdminAdminPreferencesControllerCore' => 'controllers/admin/AdminAdminPreferencesController.php',
  'AdminAttachmentsController' => 'override/controllers/admin/AdminAttachmentsController.php',
  'AdminAttachmentsControllerCore' => 'controllers/admin/AdminAttachmentsController.php',
  'AdminAttributeGeneratorController' => 'override/controllers/admin/AdminAttributeGeneratorController.php',
@@ -49,8 +49,6 @@
  'AdminCmsContentControllerCore' => 'controllers/admin/AdminCmsContentController.php',
  'AdminCmsController' => 'override/controllers/admin/AdminCmsController.php',
  'AdminCmsControllerCore' => 'controllers/admin/AdminCmsController.php',
-  'AdminContactController' => 'override/controllers/admin/AdminContactController.php',
-  'AdminContactControllerCore' => 'controllers/admin/AdminContactController.php',
  'AdminContactsController' => 'override/controllers/admin/AdminContactsController.php',
  'AdminContactsControllerCore' => 'controllers/admin/AdminContactsController.php',
  'AdminController' => 'override/classes/controller/AdminController.php',
@@ -59,12 +57,12 @@
  'AdminCountriesControllerCore' => 'controllers/admin/AdminCountriesController.php',
  'AdminCurrenciesController' => 'override/controllers/admin/AdminCurrenciesController.php',
  'AdminCurrenciesControllerCore' => 'controllers/admin/AdminCurrenciesController.php',
+  'AdminCustomerPreferencesController' => 'override/controllers/admin/AdminCustomerPreferencesController.php',
+  'AdminCustomerPreferencesControllerCore' => 'controllers/admin/AdminCustomerPreferencesController.php',
  'AdminCustomerThreadsController' => 'override/controllers/admin/AdminCustomerThreadsController.php',
  'AdminCustomerThreadsControllerCore' => 'controllers/admin/AdminCustomerThreadsController.php',
  'AdminCustomersController' => 'override/controllers/admin/AdminCustomersController.php',
  'AdminCustomersControllerCore' => 'controllers/admin/AdminCustomersController.php',
-  'AdminDbController' => 'override/controllers/admin/AdminDbController.php',
-  'AdminDbControllerCore' => 'controllers/admin/AdminDbController.php',
  'AdminDeliverySlipController' => 'override/controllers/admin/AdminDeliverySlipController.php',
  'AdminDeliverySlipControllerCore' => 'controllers/admin/AdminDeliverySlipController.php',
  'AdminEmailsController' => 'override/controllers/admin/AdminEmailsController.php',
@@ -75,8 +73,6 @@
  'AdminFeaturesControllerCore' => 'controllers/admin/AdminFeaturesController.php',
  'AdminGendersController' => 'override/controllers/admin/AdminGendersController.php',
  'AdminGendersControllerCore' => 'controllers/admin/AdminGendersController.php',
-  'AdminGeneratorController' => 'override/controllers/admin/AdminGeneratorController.php',
-  'AdminGeneratorControllerCore' => 'controllers/admin/AdminGeneratorController.php',
  'AdminGeolocationController' => 'override/controllers/admin/AdminGeolocationController.php',
  'AdminGeolocationControllerCore' => 'controllers/admin/AdminGeolocationController.php',
  'AdminGroupShopController' => 'override/controllers/admin/AdminGroupShopController.php',
@@ -101,6 +97,8 @@
  'AdminLoginControllerCore' => 'controllers/admin/AdminLoginController.php',
  'AdminLogsController' => 'override/controllers/admin/AdminLogsController.php',
  'AdminLogsControllerCore' => 'controllers/admin/AdminLogsController.php',
+  'AdminMaintenanceController' => 'override/controllers/admin/AdminMaintenanceController.php',
+  'AdminMaintenanceControllerCore' => 'controllers/admin/AdminMaintenanceController.php',
  'AdminManufacturersController' => 'override/controllers/admin/AdminManufacturersController.php',
  'AdminManufacturersControllerCore' => 'controllers/admin/AdminManufacturersController.php',
  'AdminMetaController' => 'override/controllers/admin/AdminMetaController.php',
@@ -113,6 +111,8 @@
  'AdminNotFoundControllerCore' => 'controllers/admin/AdminNotFoundController.php',
  'AdminOrderMessageController' => 'override/controllers/admin/AdminOrderMessageController.php',
  'AdminOrderMessageControllerCore' => 'controllers/admin/AdminOrderMessageController.php',
+  'AdminOrderPreferencesController' => 'override/controllers/admin/AdminOrderPreferencesController.php',
+  'AdminOrderPreferencesControllerCore' => 'controllers/admin/AdminOrderPreferencesController.php',
  'AdminOrdersController' => 'override/controllers/admin/AdminOrdersController.php',
  'AdminOrdersControllerCore' => 'controllers/admin/AdminOrdersController.php',
  'AdminOutstandingController' => 'override/controllers/admin/AdminOutstandingController.php',
@@ -121,7 +121,6 @@
  'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php',
  'AdminPaymentController' => 'override/controllers/admin/AdminPaymentController.php',
  'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php',
-  'AdminPdfController' => 'override/controllers/admin/AdminPdfController.php',
  'AdminPerformanceController' => 'override/controllers/admin/AdminPerformanceController.php',
  'AdminPerformanceControllerCore' => 'controllers/admin/AdminPerformanceController.php',
  'AdminPreferencesController' => 'override/controllers/admin/AdminPreferencesController.php',
@@ -25,6 +25,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */

+/**
+ * @deprecated 1.5.0
+ */
 abstract class AdminTabCore
 {
 	/** @var integer Tab id */
@@ -200,7 +203,7 @@ abstract class AdminTabCore
 	);

 	/** @var array noTabLink array of admintabs with no content */
-	public $noTabLink = array('AdminCatalog', 'AdminTools', 'AdminStock', 'AdminAccounting');
+	public $noTabLink = array('AdminCatalog', 'AdminPriceRule', 'AdminTools', 'AdminStock', 'AdminAdmin');

 	public function __construct()
 	{
@@ -1582,21 +1582,25 @@ abstract class ModuleCore
 			return false;
 		if (!$employee)
 			$employee = Context::getContext()->employee;
-		if (!isset($cache_permissions[$employee->id_profile]))
+
+		if ($employee->id_profile == _PS_ADMIN_PROFILE_)
+			return true;
+
+		if (!isset(self::$cache_permissions[$employee->id_profile]))
 		{
-			$cache_permissions[$employee->id_profile] = array();
+			self::$cache_permissions[$employee->id_profile] = array();
 			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `id_module`, `view`, `configure` FROM `'._DB_PREFIX_.'module_access` WHERE `id_profile` = '.(int)$employee->id_profile);
 			foreach ($result as $row)
 			{
-				$cache_permissions[$employee->id_profile][$row['id_module']]['view'] = $row['view'];
-				$cache_permissions[$employee->id_profile][$row['id_module']]['configure'] = $row['configure'];
+				self::$cache_permissions[$employee->id_profile][$row['id_module']]['view'] = $row['view'];
+				self::$cache_permissions[$employee->id_profile][$row['id_module']]['configure'] = $row['configure'];
 			}
 		}

-		if (!isset($cache_permissions[$employee->id_profile][$id_module]))
+		if (!isset(self::$cache_permissions[$employee->id_profile][$id_module]))
 			throw new PrestaShopException('No access reference in table module_access for id_module '.$id_module.'.');

-		return (bool)$cache_permissions[$employee->id_profile][$id_module][$variable];
+		return (bool)self::$cache_permissions[$employee->id_profile][$id_module][$variable];
 	}

 	/**
@@ -114,17 +114,33 @@ class ProfileCore extends ObjectModel
 	{
 		if (!isset(self::$_cache_accesses[$id_profile]))
 		{
-			$result = Db::getInstance()->executeS('
-			SELECT *
-			FROM `'._DB_PREFIX_.'access`
-			WHERE `id_profile` = '.(int)$id_profile);
-
-			self::$_cache_accesses[$id_profile] = array();
-			foreach ($result as $row)
+			// Super admin profile has full auth
+			if ($id_profile == _PS_ADMIN_PROFILE_)
 			{
-				if (!isset(self::$_cache_accesses[$id_profile][$row['id_tab']]))
-					self::$_cache_accesses[$id_profile][$row['id_tab']] = array();
-				self::$_cache_accesses[$id_profile][$row['id_tab']] = $row;
+				foreach (Tab::getTabs(Context::getContext()->language->id) as $tab)
+					self::$_cache_accesses[$id_profile][$tab['id_tab']] = array(
+						'id_profile' => _PS_ADMIN_PROFILE_,
+						'id_tab' => $tab['id_tab'],
+						'view' => '1',
+						'add' => '1',
+						'edit' => '1',
+						'delete' => '1',
+					);
+			}
+			else
+			{
+				$result = Db::getInstance()->executeS('
+				SELECT *
+				FROM `'._DB_PREFIX_.'access`
+				WHERE `id_profile` = '.(int)$id_profile);
+
+				self::$_cache_accesses[$id_profile] = array();
+				foreach ($result as $row)
+				{
+					if (!isset(self::$_cache_accesses[$id_profile][$row['id_tab']]))
+						self::$_cache_accesses[$id_profile][$row['id_tab']] = array();
+					self::$_cache_accesses[$id_profile][$row['id_tab']] = $row;
+				}
 			}
 		}
 		return self::$_cache_accesses[$id_profile];
@@ -429,6 +429,9 @@ class TabCore extends ObjectModel
 	{
 		static $tabAccesses = null;

+		if (Context::getContext()->employee->id_profile == _PS_ADMIN_PROFILE_)
+			return true;
+
 		if ($tabAccesses === null)
 			$tabAccesses = Profile::getProfileAccesses(Context::getContext()->employee->id_profile);

@@ -1558,9 +1558,6 @@ class ToolsCore
 		if (is_null($disable_multiviews))
 			$disable_multiviews = (int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS');

-		if (!$rewrite_settings && !Shop::isFeatureActive())
-			return true;
-
 		// Check current content of .htaccess and save all code outside of prestashop comments
 		$specific_before = $specific_after = '';
 		if (file_exists($path))
@@ -1610,16 +1607,19 @@ class ToolsCore
 		if ($disable_multiviews)
 			fwrite($write_fd, "\n# Disable Multiviews\nOptions -Multiviews\n\n");

-		fwrite($write_fd, "RewriteEngine on\n\n");
-		foreach ($domains as $domain => $list_uri)
-			foreach ($list_uri as $uri)
-				// Rewrite virtual multishop uri
-				if ($uri['virtual'])
-				{
-					fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
-					fwrite($write_fd, 'RewriteRule ^'.trim($uri['virtual'], '/').'/?$ '.$uri['physical'].$uri['virtual']."index.php [L,R]\n");
-					fwrite($write_fd, 'RewriteRule ^'.ltrim($uri['virtual'], '/').'(.*) '.$uri['physical']."$1 [L]\n\n");
-				}
+		if (Shop::isFeatureActive())
+		{
+			fwrite($write_fd, "RewriteEngine on\n\n");
+			foreach ($domains as $domain => $list_uri)
+				foreach ($list_uri as $uri)
+					// Rewrite virtual multishop uri
+					if ($uri['virtual'])
+					{
+						fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
+						fwrite($write_fd, 'RewriteRule ^'.trim($uri['virtual'], '/').'/?$ '.$uri['physical'].$uri['virtual']."index.php [L,R]\n");
+						fwrite($write_fd, 'RewriteRule ^'.ltrim($uri['virtual'], '/').'(.*) '.$uri['physical']."$1 [L]\n\n");
+					}
+		}

 		// Webservice
 		fwrite($write_fd, 'RewriteRule ^api/?(.*)$ '."webservice/dispatcher.php?url=$1 [QSA,L]\n\n");
@@ -61,7 +61,7 @@ class AdminControllerCore extends Controller
 	public $id = -1;

 	/** @var array noTabLink array of admintab names which have no content */
-	public $noTabLink = array('AdminCatalog', 'AdminTools', 'AdminStock', 'AdminAccounting');
+	public $noTabLink = array('AdminCatalog', 'AdminPriceRule', 'AdminTools', 'AdminStock', 'AdminAdmin');

 	public $required_database = false;

@@ -1250,15 +1250,11 @@ class AdminControllerCore extends Controller
 			$tabs[$index]['href'] = $this->context->link->getAdminLink($tab['class_name']);

 			$sub_tabs = Tab::getTabs($this->context->language->id, $tab['id_tab']);
-			// Add parent tab to sub_tabs list
-			array_unshift($sub_tabs, $tab);
-
 			foreach ($sub_tabs as $index2 => $sub_tab)
 			{
 				// class_name is the name of the class controller
 				if (Tab::checkTabRights($sub_tab['id_tab']) === true
-						&& (bool)$sub_tab['active']
-						&& !in_array($sub_tab['class_name'], $this->noTabLink)) // check that tab is not in "do not display" list
+					&& (bool)$sub_tab['active'])
 					$sub_tabs[$index2]['href'] = $this->context->link->getAdminLink($sub_tab['class_name']);
 				else
 					unset($sub_tabs[$index2]);
@@ -121,8 +121,6 @@ class HelperOptionsCore extends Helper
 							}
 						</script>';
 					$field['link_remove_ip'] = ' &nbsp<a href="#" class="button" onclick="addRemoteAddr(); return false;">'.$this->l('Add my IP', 'Helper').'</a>';
-					if (!isset($category_data['bottom']))
-						$category_data['bottom'] = '<script type="text/javascript">changeCMSActivationAuthorization();</script>';
 				}

 				// Multishop default value
@@ -0,0 +1,206 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminAdminPreferencesControllerCore extends AdminController
+{
+
+	public function __construct()
+	{
+		$this->className = 'Configuration';
+		$this->table = 'configuration';
+
+		parent::__construct();
+
+		// Upload quota
+		$max_upload = (int)ini_get('upload_max_filesize');
+		$max_post = (int)ini_get('post_max_size');
+		$upload_mb = min($max_upload, $max_post);
+
+		// Options list
+		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('General'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PRESTASTORE_LIVE' => array(
+						'title' => $this->l('Automatically check for module updates'),
+						'desc' => $this->l('New modules and updates are displayed on the modules page'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_COOKIE_CHECKIP' => array(
+						'title' => $this->l('Check IP on the cookie'),
+						'desc' => $this->l('Check the IP address of the cookie in order to avoid your cookie being stolen'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool',
+						'default' => '0',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_COOKIE_LIFETIME_FO' => array(
+						'title' => $this->l('Lifetime of the Front Office cookie'),
+						'desc' => $this->l('Indicate the number of hours'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'default' => '480',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_COOKIE_LIFETIME_BO' => array(
+						'title' => $this->l('Lifetime of the Back Office cookie'),
+						'desc' => $this->l('Indicate the number of hours'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'default' => '480',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+				),
+			),
+			'upload' => array(
+				'title' =>	$this->l('Upload quota'),
+				'icon' =>	'tab-preferences',
+				'fields' => array(
+					'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
+						'title' => $this->l('Attachment maximum size'),
+						'desc' => $this->l('Set the maximum size of attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
+							((int)str_replace('M', '', ini_get('post_max_size')) > (int)str_replace('M', '', ini_get('upload_max_filesize')) ? ini_get('upload_max_filesize') : ini_get('post_max_size')),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'suffix' => $this->l('Megabits'),
+						'default' => '2'
+					),
+					'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
+						'title' => $this->l('Limit upload file value'),
+						'desc' => $this->l('Define the limit upload for a downloadable product, this value have to be inferior or egal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'suffix' => $this->l('Megabits'),
+						'default' => '1'
+					),
+					'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
+						'title' => $this->l('Limit upload image value'),
+						'desc' => $this->l('Define the limit upload for an image, this value have to be inferior or egal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'suffix' => $this->l('Megabits'),
+						'default' => '1'
+					),
+				),
+			),
+			'help' => array(
+				'title' =>	$this->l('Help'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_HELPBOX' => array(
+						'title' => $this->l('Back Office help boxes'),
+						'desc' => $this->l('Enable yellow help boxes which are displayed under form fields in the Back Office'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_HIDE_OPTIMIZATION_TIPS' => array(
+						'title' => $this->l('Hide optimization tips'),
+						'desc' => $this->l('Hide optimization tips on the back office homepage'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+				),
+			),
+			'notifications' => array(
+				'title' =>	$this->l('Notifications'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_SHOW_NEW_ORDERS' => array(
+						'title' => $this->l('Show notifications for new orders'),
+						'desc' => $this->l('This will display notifications when new orders will be made on your shop'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_SHOW_NEW_CUSTOMERS' => array(
+						'title' => $this->l('Show notifications for new customers'),
+						'desc' => $this->l('This will display notifications when new customers will register on your shop'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_SHOW_NEW_MESSAGES' => array(
+						'title' => $this->l('Show notifications for new messages'),
+						'desc' => $this->l('This will display notifications when new messages will be posted on your shop'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+				),
+			),
+		);
+	}
+
+	public function postProcess()
+	{
+		$upload_max_size = (int)str_replace('M', '', ini_get('upload_max_filesize'));
+		$post_max_size = (int)str_replace('M', '', ini_get('post_max_size'));
+		$max_size = $upload_max_size < $post_max_size ? $upload_max_size : $post_max_size;
+
+		if (Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE') > $max_size || Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE') > $max_size)
+		{
+			$this->errors[] = Tools::displayError('The limit choosen is superior to the server\'s maximum upload file You need to improve the limit of your server.');
+			return;
+		}
+
+		if (Tools::getIsset('PS_LIMIT_UPLOAD_FILE_VALUE') && !Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE'))
+			$_POST['PS_LIMIT_UPLOAD_FILE_VALUE'] = 1;
+
+		if (Tools::getIsset('PS_LIMIT_UPLOAD_IMAGE_VALUE') && !Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE'))
+			$_POST['PS_LIMIT_UPLOAD_IMAGE_VALUE'] = 1;
+
+		parent::postProcess();
+	}
+
+	/**
+	 * Update PS_ATTACHMENT_MAXIMUM_SIZE
+	 */
+	public function updateOptionPsAttachementMaximumSize($value)
+	{
+		if (!$value)
+			return;
+
+		$upload_max_size = (int)str_replace('M', '', ini_get('upload_max_filesize'));
+		$post_max_size = (int)str_replace('M', '', ini_get('post_max_size'));
+		$max_size = $upload_max_size < $post_max_size ? $upload_max_size : $post_max_size;
+		$value = ($max_size < Tools::getValue('PS_ATTACHMENT_MAXIMUM_SIZE')) ? $max_size : Tools::getValue('PS_ATTACHMENT_MAXIMUM_SIZE');
+		Configuration::updateValue('PS_ATTACHMENT_MAXIMUM_SIZE', $value);
+	}
+}
@@ -1,124 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminAliasesControllerCore extends AdminController
-{
-	public function __construct()
-	{
-	 	$this->table = 'alias';
-		$this->className = 'Alias';
-	 	$this->lang = false;
-		$this->requiredDatabase = true;
-
-		$this->addRowAction('edit');
-		$this->addRowAction('delete');
-
-		$this->context = Context::getContext();
-
-		if (!Tools::getValue('realedit'))
-			$this->deleted = false;
-
-	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
-
-		$this->fieldsDisplay = array(
-			'alias' => array('title' => $this->l('Aliases'), 'width' => 'auto'),
-			'search' => array('title' => $this->l('Search'), 'width' => 100),
-			'active' => array('title' => $this->l('Status'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
-		);
-
-		parent::__construct();
-	}
-
-	public function renderForm()
-	{
-		$this->fields_form = array(
-			'legend' => array(
-				'title' => $this->l('Aliases'),
-				'image' => '../img/admin/search.gif'
-			),
-			'input' => array(
-				array(
-					'type' => 'text',
-					'label' => $this->l('Alias:'),
-					'name' => 'alias',
-					'size' => 40,
-					'required' => true,
-					'desc' => array(
-						$this->l('Enter each alias separated by a comma (\',\') (e.g., \'prestshop,preztashop,prestasohp\')'),
-						$this->l('Forbidden characters: <>;=#{}')
-					)
-				),
-				array(
-					'type' => 'text',
-					'label' => $this->l('Result:'),
-					'name' => 'search',
-					'size' => 15,
-					'required' => true,
-					'desc' => $this->l('Search this word instead.')
-				)
-			),
-			'submit' => array(
-				'title' => $this->l('   Save   '),
-				'class' => 'button'
-			)
-		);
-
-		$this->fields_value = array('alias' => $this->object->getAliases());
-
-		return parent::renderForm();
-	}
-
-	public function postProcess()
-	{
-		if (isset($_POST['submitAdd'.$this->table]))
-		{
-			$search = strval(Tools::getValue('search'));
-			$string = strval(Tools::getValue('alias'));
-		 	$aliases = explode(',', $string);
-			if (empty($search) || empty($string))
-				$this->errors[] = $this->l('aliases and result are both required');
-			if (!Validate::isValidSearch($search))
-				$this->errors[] = $search.' '.$this->l('is not a valid result');
-		 	foreach ($aliases as $alias)
-				if (!Validate::isValidSearch($alias))
-					$this->errors[] = $alias.' '.$this->l('is not a valid alias');
-
-			if (!count($this->errors))
-			{
-			 	foreach ($aliases as $alias)
-			 	{
-					$obj = new Alias(null, trim($alias), trim($search));
-						$obj->save();
-			 	}
-			}
-		}
-		else
-			parent::postProcess();
-	}
-}
-
-
@@ -1,206 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 7060 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminContactControllerCore extends AdminController
-{
-	public function __construct()
-	{
-		$this->className = 'Configuration';
-		$this->table = 'configuration';
-
-		parent::__construct();
-
-		$temporyArrayFields = $this->_getDefaultFieldsContent();
-		$this->_buildOrderedFieldsShop($temporyArrayFields);
-	}
-
-	protected function _getDefaultFieldsContent()
-	{
-		$this->context = Context::getContext();
-		$countryList = array();
-		$countryList[] = array('id' => '0', 'name' => $this->l('Choose your country'));
-		foreach (Country::getCountries($this->context->language->id) as $country)
-			$countryList[] = array('id' => $country['id_country'], 'name' => $country['name']);
-		$stateList = array();
-		$stateList[] = array('id' => '0', 'name' => $this->l('Choose your state (if applicable)'));
-		foreach (State::getStates($this->context->language->id) as $state)
-			$stateList[] = array('id' => $state['id_state'], 'name' => $state['name']);
-
-		$formFields = array(
-			'PS_SHOP_NAME' => array(
-				'title' => $this->l('Shop name:'),
-				'desc' => $this->l('Displayed in e-mails and page titles'),
-				'validation' => 'isGenericName',
-				'required' => true,
-				'size' => 30,
-				'type' => 'text'
-			),
-			'PS_SHOP_EMAIL' => array('title' => $this->l('Shop e-mail:'),
-				'desc' => $this->l('Displayed in e-mails sent to customers'),
-				'validation' => 'isEmail',
-				'required' => true,
-				'size' => 30,
-				'type' => 'text'
-			),
-			'PS_SHOP_DETAILS' => array(
-				'title' => $this->l('Registration:'),
-				'desc' => $this->l('Shop registration information (e.g., SIRET or RCS)'),
-				'validation' => 'isGenericName',
-				'size' => 30,
-				'type' => 'textarea',
-				'cols' => 30,
-				'rows' => 5
-			),
-			'PS_SHOP_ADDR1' => array(
-				'title' => $this->l('Shop address line 1:'),
-				'validation' => 'isAddress',
-				'size' => 30,
-				'type' => 'text'
-			),
-			'PS_SHOP_ADDR2' => array(
-				'title' => 'Address line 2',
-				'validation' => 'isAddress',
-				'size' => 30,
-				'type' => 'text'
-			),
-			'PS_SHOP_CODE' => array(
-				'title' => $this->l('Post/Zip code:'),
-				'validation' => 'isGenericName',
-				'size' => 6,
-				'type' => 'text'
-			),
-			'PS_SHOP_CITY' => array(
-				'title' => $this->l('City:'),
-				'validation' => 'isGenericName',
-				'size' => 30,
-				'type' => 'text'),
-			'PS_SHOP_COUNTRY_ID' => array(
-				'title' => $this->l('Country:'),
-				'validation' => 'isInt',
-				'type' => 'select',
-				'list' => $countryList,
-				'identifier' => 'id',
-				'cast' => 'intval',
-				'defaultValue' => (int)$this->context->country->id
-			),
-			'PS_SHOP_STATE_ID' => array(
-				'title' => $this->l('State:'),
-				'validation' => 'isInt',
-				'type' => 'select',
-				'list' => $stateList,
-				'identifier' => 'id',
-				'cast' => 'intval'
-			),
-			'PS_SHOP_PHONE' => array(
-				'title' => $this->l('Phone:'),
-				'validation' => 'isGenericName',
-				'size' => 30,
-				'type' => 'text'
-			),
-			'PS_SHOP_FAX' => array(
-				'title' => $this->l('Fax:'),
-				'validation' => 'isGenericName',
-				'size' => 30,
-				'type' => 'text'
-			),
-		);
-		return $formFields;
-	}
-
-	protected function _buildOrderedFieldsShop($formFields)
-	{
-		$associatedOrderKey = array(
-			'PS_SHOP_NAME' => 'company',
-			'PS_SHOP_ADDR1' => 'address1',
-			'PS_SHOP_ADDR2' => 'address2',
-			'PS_SHOP_CITY' => 'city',
-			'PS_SHOP_STATE_ID' => 'State:name',
-			'PS_SHOP_CODE' => 'postcode',
-			'PS_SHOP_COUNTRY_ID' => 'Country:name',
-			'PS_SHOP_PHONE' => 'phone');
-
-		$fields = array();
-		$orderedFields = AddressFormat::getOrderedAddressFields(Configuration::get('PS_SHOP_COUNTRY_ID'), false, true);
-
-		foreach ($orderedFields as $lineFields)
-			if (($patterns = explode(' ', $lineFields)))
-				foreach ($patterns as $pattern)
-					if (($key = array_search($pattern, $associatedOrderKey)))
-						$fields[$key] = $formFields[$key];
-		foreach ($formFields as $key => $value)
-			if (!isset($fields[$key]))
-				$fields[$key] = $formFields[$key];
-
-		$this->options = array(
-			'general' => array(
-				'title' =>	$this->l('Contact details'),
-				'icon' =>	'tab-contact',
-				'fields' =>	$fields,
-				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button')
-			),
-		);
-	}
-
-	public function beforeUpdateOptions()
-	{
-		if (isset($_POST['PS_SHOP_STATE_ID']) && $_POST['PS_SHOP_STATE_ID'] != '0')
-		{
-			$sql = 'SELECT `active` FROM `'._DB_PREFIX_.'state`
-					WHERE `id_country` = '.(int)Tools::getValue('PS_SHOP_COUNTRY_ID').'
-						AND `id_state` = '.(int)Tools::getValue('PS_SHOP_STATE_ID');
-			$isStateOk = Db::getInstance()->getValue($sql);
-			if ($isStateOk != 1)
-				$this->errors[] = Tools::displayError('This state is not in this country.');
-		}
-	}
-
-	public function updateOptionPsShopCountryId($value)
-	{
-		if (!$this->errors && $value)
-		{
-			$country = new Country($value, $this->context->language->id);
-			if ($country->id)
-			{
-				Configuration::updateValue('PS_SHOP_COUNTRY_ID', $value);
-				Configuration::updateValue('PS_SHOP_COUNTRY', pSQL($country->name));
-			}
-		}
-	}
-
-	public function updateOptionPsShopStateId($value)
-	{
-		if (!$this->errors && $value)
-		{
-			$state = new State($value);
-			if ($state->id)
-			{
-				Configuration::updateValue('PS_SHOP_STATE_ID', $value);
-				Configuration::updateValue('PS_SHOP_STATE', pSQL($state->name));
-			}
-		}
-	}
-}
@@ -56,14 +56,6 @@ class AdminCountriesControllerCore extends AdminController
 			'general' => array(
 				'title' =>	$this->l('Countries options'),
 				'fields' =>	array(
-					'PS_COUNTRY_DEFAULT' => array(
-						'title' => $this->l('Default country:'),
-						'desc' => $this->l('The default country used in shop'),
-						'cast' => 'intval',
-						'type' => 'select',
-						'identifier' => 'id_country',
-						'list' => Country::getCountries(Context::getContext()->language->id)
-					),
 					'PS_RESTRICT_DELIVERED_COUNTRIES' => array(
 						'title' => $this->l('Restrict countries in FO by those delivered by active carriers'),
 						'cast' => 'intval',
@@ -54,22 +54,6 @@ class AdminCurrenciesControllerCore extends AdminController
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));

 		$this->options = array(
-			'general' => array(
-				'title' =>	$this->l('Currencies options'),
-				'fields' =>	array(
-					'PS_CURRENCY_DEFAULT' => array(
-						'title' => $this->l('Default currency:'),
-						'desc' => $this->l('The default currency used in shop')
-							.'<div class="warn">'.
-								$this->l('If you change default currency, you will have to manually edit every product price.').'</div>',
-						'cast' => 'intval',
-						'type' => 'select',
-						'identifier' => 'id_currency',
-						'list' => Currency::getCurrencies()
-					)
-				),
-				'submit' => array()
-			),
 			'change' => array(
 				'title' =>	$this->l('Currency rates'),
 				'image' => '../img/admin/exchangesrate.gif',
@@ -319,11 +303,5 @@ class AdminCurrenciesControllerCore extends AdminController
 		}
 		parent::initProcess();
 	}
-
-	public function updateOptionPsCurrencyDefault($value)
-	{
-		Configuration::updateValue('PS_CURRENCY_DEFAULT', $value);
-		Currency::refreshCurrencies();
-	}
 }

@@ -0,0 +1,114 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminCustomerPreferencesControllerCore extends AdminController
+{
+	public function __construct()
+	{
+		$this->className = 'Configuration';
+		$this->table = 'configuration';
+
+		parent::__construct();
+
+		$registration_process_type = array(
+			array(
+				'value' => PS_REGISTRATION_PROCESS_STANDARD,
+				'name' => $this->l('Only account creation')
+			),
+			array(
+				'value' => PS_REGISTRATION_PROCESS_AIO,
+				'name' => $this->l('Standard (account creation and address creation)')
+			)
+		);
+
+		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('General'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_REGISTRATION_PROCESS_TYPE' => array(
+						'title' => $this->l('Registration process type'),
+						'desc' => $this->l('The "Only account creation" step register process allows the customer to register faster, and create his address later.'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'select',
+						'list' => $registration_process_type,
+						'identifier' => 'value'
+					),
+					'PS_CART_FOLLOWING' => array(
+						'title' => $this->l('Cart re-display at login'),
+						'desc' => $this->l('After customer logs in, recall and display contents of his/her last shopping cart'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_PASSWD_TIME_FRONT' => array(
+						'title' => $this->l('Regenerate password:'),
+						'desc' => $this->l('Security minimum time to wait to regenerate the password'),
+						'validation' => 'isUnsignedInt',
+						'cast' => 'intval',
+						'size' => 5,
+						'type' => 'text',
+						'suffix' => $this->l('minutes')
+					),
+					'PS_B2B_ENABLE' => array(
+						'title' => $this->l('Enable B2B mode'),
+						'desc' => $this->l('Activate or deactivate B2B mode. When this option is enable some features about B2B appear.'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
+			),
+		);
+	}
+
+	/**
+	 * Update PS_B2B_ENABLE and enables / disables the associated tabs
+	 * @param $value integer Value of option
+	 */
+	public function updateOptionPsB2bEnable($value)
+	{
+		$value = (int)$value;
+
+		$tabs_class_name = array('AdminOutstanding');
+		if (!empty($tabs_class_name))
+		{
+			foreach ($tabs_class_name as $tab_class_name)
+			{
+				$tab = Tab::getInstanceFromClassName($tab_class_name);
+				if (Validate::isLoadedObject($tab))
+				{
+					$tab->active = $value;
+					$tab->save();
+				}
+			}
+		}
+		Configuration::updateValue('PS_B2B_ENABLE', $value);
+	}
+}
@@ -138,24 +138,6 @@ class AdminCustomersControllerCore extends AdminController
 		$this->shopLinkType = 'shop';
 		$this->shopShareDatas = Shop::SHARE_CUSTOMER;

-		$this->options = array(
-			'general' => array(
-				'title' =>	$this->l('Customers options'),
-				'fields' =>	array(
-					'PS_PASSWD_TIME_FRONT' => array(
-						'title' => $this->l('Regenerate password:'),
-						'desc' => $this->l('Security minimum time to wait to regenerate the password'),
-						'validation' => 'isUnsignedInt',
-						'cast' => 'intval',
-						'size' => 5,
-						'type' => 'text',
-						'suffix' => ' '.$this->l('minutes')
-					)
-				),
-				'submit' => array()
-			)
-		);
-
 		parent::__construct();
 	}

@@ -742,7 +724,6 @@ class AdminCustomersControllerCore extends AdminController
 			else
 				return false;
 		}
-
 	}

 	public function processUpdate($token)
@@ -1,275 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 7465 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminDbControllerCore extends AdminController
-{
-	public function __construct()
-	{
-		$this->className = 'Configuration';
-		$this->table = 'configuration';
-
-		parent::__construct();
-
-		$this->options = array(
-			'database' => array(
-				'title' =>	$this->l('Database'),
-				'icon' =>	'database_gear',
-				'fields' =>	array(
-				 	'db_server' => array(
-				 		'title' => $this->l('Server:'),
-				 		'desc' => $this->l('IP or server name; \'localhost\' will work in most cases'),
-				 		'size' => 30,
-				 		'type' => 'text',
-				 		'required' => true,
-				 		'defaultValue' => _DB_SERVER_,
-				 		'visibility' => Shop::CONTEXT_ALL
-					),
-					'db_name' => array(
-						'title' => $this->l('Database:'),
-						'desc' => $this->l('Database name (e.g., \'prestashop\')'),
-						'size' => 30,
-						'type' => 'text',
-						'required' => true,
-						'defaultValue' => _DB_NAME_,
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'db_prefix' => array(
-						'title' => $this->l('Prefix:'),
-						'size' => 30,
-						'type' => 'text',
-						'defaultValue' => _DB_PREFIX_,
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'db_user' => array(
-						'title' => $this->l('User:'),
-						'size' => 30,
-						'type' => 'text',
-						'required' => true,
-						'defaultValue' => _DB_USER_,
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'db_passwd' => array(
-						'title' => $this->l('Password:'),
-						'size' => 30,
-						'type' => 'password',
-						'desc' => $this->l('Leave blank if no change'),
-						'defaultValue' => _DB_PASSWD_,
-						'visibility' => Shop::CONTEXT_ALL
-					)
-				),
-				'submit' => array()
-			)
-		);
-
-		$this->fieldsDisplay = array (
-			'table' => array(
-				'title' => $this->l('Table'),
-				'type' => 'string',
-				'width' => 120
-			),
-			'table_engine' => array(
-				'title' => $this->l('Table Engine'),
-				'type' => 'string',
-				'width' => 120
-			)
-		);
-	}
-
-	public function initContent()
-	{
-		$this->warnings[] = $this->l('Be VERY CAREFUL with these settings, as changes may cause your PrestaShop online store to malfunction. For all issues, check the config/settings.inc.php file.');
-		$this->display = 'options';
-		$this->initToolbar();
-		$this->content .= $this->renderOptions();
-		$this->content .= $this->renderForm();
-
-		$this->context->smarty->assign(array(
-			'content' => $this->content,
-			'url_post' => self::$currentIndex.'&token='.$this->token,
-		));
-	}
-
-	public function renderForm()
-	{
-		$engines = array();
-		$tab_engines = $this->getEngines();
-		foreach ($tab_engines as $key => $engine)
-			$engines[]['name'] = $engine;
-
-		$this->fields_form = array(
-			'legend' => array(
-				'title' => $this->l('MySQL Engine'),
-				'image' => '../img/admin/AdminBackup.gif'
-			),
-			'input' => array(
-				array(
-					'type' => 'table',
-					'name' => 'table'
-				),
-				array(
-					'type' => 'select',
-					'label' => $this->l('Change Engine to'),
-					'name' => 'engineType',
-					'options' => array(
-						'query' => $engines,
-						'id' => 'name',
-						'name' => 'name'
-					)
-				)
-			),
-			'submit' => array(
-				'title' => $this->l('   Save   '),
-				'class' => 'button'
-			)
-		);
-
-		$table_status = $this->getTablesStatus();
-		foreach ($table_status as $key => $table)
-			if (!preg_match('#^'._DB_PREFIX_.'.*#Ui', $table['Name']))
-				unset($table_status[$key]);
-
-		$this->tpl_form_vars = array('table_status' => $table_status);
-
-		$this->show_toolbar = false;
-
-		return parent::renderForm();
-	}
-
-	/*
-	public function initContent()
-	{
-		$this->warnings[] = $this->l('Be VERY CAREFUL with these settings, as changes may cause your PrestaShop online store to malfunction. 
-			For all issues, check the config/settings.inc.php file.');
-
-		$this->initToolbar();
-		$this->content .= $this->renderOptions();
-
-		$table_status = $this->getTablesStatus();
-		foreach ($table_status as $key => $table)
-			if (!preg_match('#^'._DB_PREFIX_.'.*#Ui', $table['Name']))
-				unset($table_status[$key]);
-
-		$this->context->smarty->assign(array(
-			'update_url' => self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token,
-			'table_status' => $table_status,
-			'engines' => $this->getEngines(),
-			'content' => $this->content,
-		));
-	}
-	*/
-
-	public function postProcess()
-	{
-		// PrestaShop demo mode
-		if (_PS_MODE_DEMO_)
-		{
-			$this->errors[] = Tools::displayError('This functionnality has been disabled.');
-			return;
-		}
-
-		if ($this->action == 'update_options')
-		{
-			foreach ($this->options['database']['fields'] as $field => $values)
-				if (isset($values['required']) && $values['required'])
-					if (($value = Tools::getValue($field)) == false && (string)$value != '0')
-						$this->errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
-
-			if (!count($this->errors))
-			{
-				/* Datas are not saved in database but in config/settings.inc.php */
-				$settings = array();
-			 	foreach ($this->options['database']['fields'] as $k => $data)
-					if ($value = Tools::getValue($k))
-						$settings['_'.Tools::strtoupper($k).'_'] = $value;
-
-				if (Db::checkConnection(
-					isset($settings['_DB_SERVER_']) ? $settings['_DB_SERVER_'] : _DB_SERVER_,
-					isset($settings['_DB_USER_']) ? $settings['_DB_USER_'] : _DB_USER_,
-					isset($settings['_DB_PASSWD_']) ? $settings['_DB_PASSWD_'] : _DB_PASSWD_,
-					isset($settings['_DB_NAME_']) ? $settings['_DB_NAME_'] : _DB_NAME_,
-					true
-				) == 0)
-				{
-			 		rewriteSettingsFile(null, null, $settings);
-			 		Tools::redirectAdmin(self::$currentIndex.'&conf=6'.'&token='.$this->token);
-				}
-				else
-					$this->errors[] = Tools::displayError('Unable to connect to a database with these identifiers.');
-			}
-		}
-
-		// Change engine
-		if ($this->action == 'save')
-		{
-			if (!isset($_POST['tablesBox']) || !count($_POST['tablesBox']))
-				$this->errors[] = Tools::displayError('You did not select any tables');
-			else
-			{
-				$available_engines = $this->getEngines();
-				$tables_status = $this->getTablesStatus();
-				$tables_engine = array();
-
-				foreach ($tables_status as $table)
-					$tables_engine[$table['Name']] = $table['Engine'];
-
-				$engine_type = pSQL(Tools::getValue('engineType'));
-
-				/* Datas are not saved in database but in config/settings.inc.php */
-				$settings = array('_MYSQL_ENGINE_' => $engine_type);
-			    rewriteSettingsFile(null, null, $settings);
-
-				foreach ($_POST['tablesBox'] as $table)
-				{
-					if ($engine_type == $tables_engine[$table])
-						$this->errors[] = $table.' '.$this->l('is already in').' '.$engine_type;
-					else
-						if (!Db::getInstance()->execute('ALTER TABLE `'.bqSQL($table).'` ENGINE=`'.bqSQL($engine_type).'`'))
-							$this->errors[] = $this->l('Can\'t change engine for').' '.$table;
-				}
-				if (!count($this->errors))
-			 		Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token);
-			}
-		}
-	}
-
-	public function getEngines()
-	{
-		$engines = Db::getInstance()->executeS('SHOW ENGINES');
-		$allowed_engines = array();
-		foreach ($engines as $engine)
-			if (in_array($engine['Engine'], array('InnoDB', 'MyISAM')) && in_array($engine['Support'], array('DEFAULT', 'YES')))
-				$allowed_engines[] = $engine['Engine'];
-		return $allowed_engines;
-	}
-
-	public function getTablesStatus()
-	{
-		return Db::getInstance()->executeS('SHOW TABLE STATUS');
-	}
-}
-
-
@@ -1,181 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminGeneratorControllerCore extends AdminController
-{
-	protected $options = array('array for auto display');
-
-	public function __construct()
-	{
-		$this->ht_file = _PS_ROOT_DIR_.'/.htaccess';
-		$this->rb_file = _PS_ROOT_DIR_.'/robots.txt';
-		$this->sm_file = _PS_ROOT_DIR_.'/sitemap.xml';
-		$this->rb_data = $this->getRobotsContent();
-
-		return parent::__construct();
-	}
-
-	public function initContent()
-	{
-		$this->tpl_option_vars['checkConfiguration_ht'] = $this->checkConfiguration($this->ht_file);
-		$this->tpl_option_vars['checkConfiguration_rb'] = $this->checkConfiguration($this->rb_file);
-		$this->tpl_option_vars['ps_htaccess_cache_control'] = Configuration::get('PS_HTACCESS_CACHE_CONTROL');
-		$this->tpl_option_vars['ps_rewriting_settings'] = Configuration::get('PS_REWRITING_SETTINGS');
-		$this->tpl_option_vars['mod_rewrite'] = Tools::modRewriteActive();
-		$this->tpl_option_vars['ps_htaccess_disable_multiviews'] = Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS');
-
-		parent::initContent();
-	}
-
-	public function checkConfiguration($file)
-	{
-		if (file_exists($file))
-			return is_writable($file);
-		return is_writable(dirname($file));
-	}
-
-	public function postProcess()
-	{
-		if (Tools::isSubmit('submitHtaccess'))
-		{
-			if ($this->tabAccess['edit'] === '1')
-			{
-				Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL'));
-				Configuration::updateValue('PS_REWRITING_SETTINGS', (int)Tools::getValue('PS_REWRITING_SETTINGS'));
-				Configuration::updateValue('PS_HTACCESS_DISABLE_MULTIVIEWS', (int)Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS'));
-				if (Tools::generateHtaccess($this->ht_file, null, null, '', Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS')))
-					Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
-				$this->errors[] = $this->l('Cannot write into file:').' <b>'.$this->ht_file.'</b><br />'.$this->l('Please check write permissions.');
-			}
-			else
-				$this->errors[] = Tools::displayError('You do not have permission to edit here.');
-		}
-
-		if (Tools::isSubmit('submitRobots'))
-		{
-			if ($this->tabAccess['edit'] === '1')
-			{
-				if (!$write_fd = @fopen($this->rb_file, 'w'))
-					$this->errors[] = sprintf(Tools::displayError('Cannot write into file: %s. Please check write permissions.'), $this->rb_file);
-				else
-				{
-					// PS Comments
-					fwrite($write_fd, "# robots.txt automaticaly generated by PrestaShop e-commerce open-source solution\n");
-					fwrite($write_fd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n");
-					fwrite($write_fd, "# This file is to prevent the crawling and indexing of certain parts\n");
-					fwrite($write_fd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n");
-					fwrite($write_fd, "# and Google. By telling these \"robots\" where not to go on your site,\n");
-					fwrite($write_fd, "# you save bandwidth and server resources.\n");
-					fwrite($write_fd, "# For more information about the robots.txt standard, see:\n");
-					fwrite($write_fd, "# http://www.robotstxt.org/wc/robots.html\n");
-
-					//GoogleBot specific
-					fwrite($write_fd, "# GoogleBot specific\n");
-					fwrite($write_fd, "User-agent: Googlebot\n");
-					foreach ($this->rb_data['GB'] as $gb)
-						fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$gb."\n");
-
-					// User-Agent
-					fwrite($write_fd, "# All bots\n");
-					fwrite($write_fd, "User-agent: *\n");
-
-					// Directories
-					fwrite($write_fd, "# Directories\n");
-					foreach ($this->rb_data['Directories'] as $dir)
-						fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$dir."\n");
-
-					// Files
-					fwrite($write_fd, "# Files\n");
-					foreach ($this->rb_data['Files'] as $file)
-						fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$file."\n");
-
-					// Sitemap
-					fwrite($write_fd, "# Sitemap\n");
-					if (file_exists($this->sm_file))
-						if (filesize($this->sm_file))
-							fwrite(
-								$write_fd,
-								'Sitemap: '.(Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].__PS_BASE_URI__.'sitemap.xml'."\n"
-							);
-					fwrite($write_fd, "\n");
-
-					fclose($write_fd);
-					Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
-				}
-			} else
-				$this->errors[] = Tools::displayError('You do not have permission to edit here.');
-		}
-	}
-
-	public function getRobotsContent()
-	{
-		$tab = array();
-
-		// Directories
-		$tab['Directories'] = array('classes/', 'config/', 'download/', 'mails/', 'modules/', 'translations/', 'tools/');
-
-		// Files
-		$disallow_controllers = array(
-			'addresses', 'address', 'authentication', 'cart', 'discount', 'footer',
-			'get-file', 'header', 'history', 'identity', 'images.inc', 'init', 'my-account', 'order', 'order-opc',
-			'order-slip', 'order-detail', 'order-follow', 'order-return', 'order-confirmation', 'pagination', 'password',
-			'pdf-invoice', 'pdf-order-return', 'pdf-order-slip', 'product-sort', 'search', 'statistics','attachment', 'guest-tracking'
-		);
-
-		// Rewrite files
-		$tab['Files'] = array();
-		if (Configuration::get('PS_REWRITING_SETTINGS'))
-		{
-			$sql = 'SELECT ml.url_rewrite
-					FROM '._DB_PREFIX_.'meta m
-					INNER JOIN '._DB_PREFIX_.'meta_lang ml ON ml.id_meta = m.id_meta
-					WHERE m.page IN (\''.implode('\', \'', $disallow_controllers).'\')';
-			if ($results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
-				foreach ($results as $row)
-					$tab['Files'][] = $row['url_rewrite'];
-		}
-
-		$tab['GB'] = array(
-			'*orderby=','*orderway=','*tag=','*id_currency=','*search_query=','*id_lang=','*back=','*utm_source=','*utm_medium=','*utm_campaign=','*n='
-		);
-
-		foreach ($disallow_controllers as $controller)
-			$tab['GB'][] = '*controller='.$controller;
-
-		return $tab;
-	}
-
-	/**
-	 * @see AdminController::initToolbar()
-	 */
-	public function initToolbar()
-	{
-		parent::initToolbar();
-
-		unset($this->toolbar_btn['save']);
-	}
-}
@@ -105,7 +105,7 @@ class AdminHomeControllerCore extends AdminController
 			$this->context->smarty->assign('hide_tips', Configuration::get('PS_HIDE_OPTIMIZATION_TIPS'));
 			$opti_list[] = array(
 				'title' => $this->l('URL rewriting'),
-				'href' => $link->getAdminLink('AdminGenerator'),
+				'href' => $link->getAdminLink('AdminMeta'),
 				'color' => $lights[$rewrite]['color'],
 				'image' => $lights[$rewrite]['image'],
 			);
@@ -147,7 +147,7 @@ class AdminHomeControllerCore extends AdminController

 			$opti_list[] = array(
 				'title' => $this->l('.htaccess up-to-date'),
-				'href' => $link->getAdminLink('AdminGenerator'),
+				'href' => $link->getAdminLink('AdminMeta'),
 				'color' => $lights[$htaccessAfterUpdate]['color'],
 				'image' => $lights[$htaccessAfterUpdate]['image'],
 			);
@@ -55,12 +55,100 @@ class AdminImagesControllerCore extends AdminController
 				'description' => $this->l('JPEG images have a small file size and standard quality. PNG images have a bigger file size, a higher quality and support transparency. Note that in all cases the image files will have the .jpg extension.').'
 								  <br /><br />'.$this->l('WARNING: This feature may not be compatible with your theme or with some modules. In particular, PNG mode is not compatible with the Watermark module. If you encounter any issue, turn it off by selecting "Use JPEG".'),
 				'fields' =>	array(
-					'PS_IMAGE_QUALITY' => array('title' => $this->l('Image quality'), 'show' => true, 'required' => true, 'type' => 'radio', 'choices' => array('jpg' => $this->l('Use JPEG'), 'png' => $this->l('Use PNG only if the base image is in PNG format'), 'png_all' => $this->l('Use PNG for all images'))),
-					'PS_JPEG_QUALITY' => array('title' => $this->l('JPEG quality'), 'desc' => $this->l('Ranges from 0 (worst quality, smallest file) to 100 (best quality, biggest file)'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text'),
-		 			'PS_PNG_QUALITY' => array('title' => $this->l('PNG quality'), 'desc' => $this->l('Ranges from 9 (worst quality, smallest file) to 0 (best quality, biggest file)'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text'),
+					'PS_IMAGE_QUALITY' => array(
+						'title' => $this->l('Image quality'),
+						'show' => true,
+						'required' => true,
+						'type' => 'radio',
+						'choices' => array('jpg' => $this->l('Use JPEG'), 'png' => $this->l('Use PNG only if the base image is in PNG format'), 'png_all' => $this->l('Use PNG for all images'))
+					),
+					'PS_JPEG_QUALITY' => array(
+						'title' => $this->l('JPEG quality'),
+						'desc' => $this->l('Ranges from 0 (worst quality, smallest file) to 100 (best quality, biggest file)'),
+						'validation' => 'isUnsignedId',
+						'required' => true,
+						'cast' => 'intval',
+						'type' => 'text'
+					),
+		 			'PS_PNG_QUALITY' => array(
+						 'title' => $this->l('PNG quality'),
+						 'desc' => $this->l('Ranges from 9 (worst quality, smallest file) to 0 (best quality, biggest file)'),
+						 'validation' => 'isUnsignedId',
+						 'required' => true,
+						 'cast' => 'intval',
+						 'type' => 'text'
+					 ),
 				),
 				'submit' => array('name' => 'submitImagePreferences'),
-			)
+			),
+			'product_images' => array(
+				'title' =>	$this->l('Products images'),
+				'fields' =>	array(
+					'PS_IMAGE_GENERATION_METHOD' => array(
+						'title' => $this->l('Image generated by:'),
+						'validation' => 'isUnsignedId',
+						'required' => false,
+						'cast' => 'intval',
+						'type' => 'select',
+						'list' => array(
+							array(
+								'id' => '0',
+								'name' => $this->l('auto')
+							),
+							array(
+								'id' => '1',
+								'name' => $this->l('width')
+							),
+							array(
+								'id' => '2',
+								'name' => $this->l('height')
+							)
+						),
+						'identifier' => 'id',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_PRODUCT_PICTURE_MAX_SIZE' => array(
+						'title' => $this->l('Maximum size of product pictures:'),
+						'desc' => $this->l('The maximum size of pictures uploadable by customers (in Bytes)'),
+						'validation' => 'isUnsignedId',
+						'required' => true,
+						'cast' => 'intval',
+						'type' => 'text',
+						'suffix' => $this->l('bytes'),
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_PRODUCT_PICTURE_WIDTH' => array(
+						'title' => $this->l('Product pictures width:'),
+						'desc' => $this->l('The maximum width of pictures uploadable by customers'),
+						'validation' => 'isUnsignedId',
+						'required' => true,
+						'cast' => 'intval',
+						'type' => 'text',
+						'width' => 'px',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_PRODUCT_PICTURE_HEIGHT' => array(
+						'title' => $this->l('Product pictures height:'),
+						'desc' => $this->l('The maximum height of pictures uploadable by customers'),
+						'validation' => 'isUnsignedId',
+						'required' => true,
+						'cast' => 'intval',
+						'type' => 'text',
+						'height' => 'px',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+					'PS_LEGACY_IMAGES' => array(
+						'title' => $this->l('Use the legacy image filesystem:'),
+						'desc' => $this->l('This should be set to yes unless you successfully moved images in Preferences > Images tab'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'required' => false,
+						'type' => 'bool',
+						'visibility' => Shop::CONTEXT_ALL
+					),
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
+			),
 		);

 		$this->fields_form = array(
@@ -2156,16 +2156,14 @@ class AdminImportControllerCore extends AdminController
 					case UPLOAD_ERR_INI_SIZE:
 						$this->errors[] = Tools::displayError('The uploaded file exceeds the upload_max_filesize directive in php.ini.
 							If your server configuration allows it, you may add a directive in your .htaccess, for example:')
-						.'<br/><a href="?tab=AdminGenerator&amp;token='
-						.Tools::getAdminTokenLite('AdminGenerator').'" >
+						.'<br/><a href="'.$this->context->link->getAdminLink('AdminMeta').'" >
 						<code>php_value upload_max_filesize 20M</code> '.
 						Tools::displayError('(clic to open Generator tab)').'</a>';
 						break;
 					case UPLOAD_ERR_FORM_SIZE:
 						$this->errors[] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini.
 							If your server configuration allows it, you may add a directive in your .htaccess, for example:')
-						.'<br/><a href="?tab=AdminGenerator&amp;token='
-						.Tools::getAdminTokenLite('AdminGenerator').'" >
+						.'<br/><a href="'.$this->context->link->getAdminLink('AdminMeta').'" >
 						<code>php_value post_max_size 20M</code> '.
 						Tools::displayError('(clic to open Generator tab)').'</a>';
 						break;
@@ -37,11 +37,15 @@ class AdminInformationControllerCore extends AdminController
 	{
 		$this->tpl_view_vars = array(
 			'version' => array(
-				'mysql' => Db::getInstance()->getVersion(),
 				'php' => phpversion(),
 				'ps' => _PS_VERSION_,
 				'server' => $_SERVER['SERVER_SOFTWARE'],
 			),
+			'database' => array(
+				'version' => Db::getInstance()->getVersion(),
+				'prefix' => _DB_PREFIX_,
+				'engine' => _MYSQL_ENGINE_,
+			),
 			'uname' => function_exists('php_uname') ? php_uname('s').' '.php_uname('v').' '.php_uname('m') : '',
 			'apache_instaweb' => Tools::apacheModExists('mod_instaweb'),
 			'shop' => array(
@@ -94,22 +94,6 @@ class AdminLanguagesControllerCore extends AdminController
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 	 	$this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?');

-		$this->options = array(
-			'general' => array(
-				'title' =>	$this->l('Languages options'),
-				'fields' =>	array(
-					'PS_LANG_DEFAULT' => array(
-						'title' => $this->l('Default language:'),
-						'desc' => $this->l('The default language used in shop'),
-						'cast' => 'intval',
-						'type' => 'select',
-						'identifier' => 'id_lang',
-						'list' => Language::getlanguages(false)
-					)
-				),
-				'submit' => array()
-			)
-		);
 		parent::__construct();
 	}

@@ -478,13 +462,6 @@ class AdminLanguagesControllerCore extends AdminController
 		parent::copyFromPost($object, $table);
 	}

-	public function beforeUpdateOptions()
-	{
-		$lang = new Language((int)Tools::getValue('PS_LANG_DEFAULT'));
-		if (!$lang->active)
-			$this->errors[] = Tools::displayError('You cannot set this language as default language because it\'s disabled');
-	}
-
 	public function ajaxProcessCheckLangPack()
 	{
 		$this->json = true;
@@ -32,7 +32,43 @@ class AdminLocalizationControllerCore extends AdminController
 		$this->className = 'Configuration';
 		$this->table = 'configuration';

+		parent::__construct();
+
 		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('Configuration'),
+				'fields' =>	array(
+					'PS_LANG_DEFAULT' => array(
+						'title' => $this->l('Default language:'),
+						'desc' => $this->l('The default language used in shop'),
+						'cast' => 'intval',
+						'type' => 'select',
+						'identifier' => 'id_lang',
+						'list' => Language::getlanguages(false)
+					),
+					'PS_COUNTRY_DEFAULT' => array(
+						'title' => $this->l('Default country:'),
+						'desc' => $this->l('The default country used in shop'),
+						'cast' => 'intval',
+						'type' => 'select',
+						'identifier' => 'id_country',
+						'list' => Country::getCountries($this->context->language->id)
+					),
+					'PS_CURRENCY_DEFAULT' => array(
+						'title' => $this->l('Default currency:'),
+						'desc' =>
+							$this->l('The default currency used in shop')
+							.'<div class="warn">'
+								.$this->l('If you change default currency, you will have to manually edit every product price.')
+							.'</div>',
+						'cast' => 'intval',
+						'type' => 'select',
+						'identifier' => 'id_currency',
+						'list' => Currency::getCurrencies()
+					),
+				),
+				'submit' => array()
+			),
 			'localization' => array(
 				'title' =>	$this->l('Localization'),
 				'width' =>	'width2',
@@ -88,11 +124,20 @@ class AdminLocalizationControllerCore extends AdminController
 						'type' => 'text',
 						'visibility' => Shop::CONTEXT_ALL
 					)
-				)
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button')
 			)
 		);

-		parent::__construct();
+		if (function_exists('date_default_timezone_set'))
+			$this->options['general']['fields']['PS_TIMEZONE'] = array(
+				'title' => $this->l('Time Zone:'),
+				'validation' => 'isAnything',
+				'type' => 'select',
+				'list' => Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'),
+				'identifier' => 'name',
+				'visibility' => Shop::CONTEXT_ALL
+			);
 	}

 	public function postProcess()
@@ -231,18 +276,29 @@ class AdminLocalizationControllerCore extends AdminController

 	public function initContent()
 	{
-		// toolbar (save, cancel, new, ..)
-		$this->initToolbar();
-		$this->content .= $this->renderOptions();
-
 		if (!$this->loadObject(true))
 			return;

-		$this->content .= $this->renderForm();
+		// toolbar (save, cancel, new, ..)
+		$this->initToolbar();

 		$this->context->smarty->assign(array(
-			'content' => $this->content,
+			'localization_form' => $this->renderForm(),
+			'localization_options' => $this->renderOptions(),
 			'url_post' => self::$currentIndex.'&token='.$this->token,
 		));
 	}
+
+	public function beforeUpdateOptions()
+	{
+		$lang = new Language((int)Tools::getValue('PS_LANG_DEFAULT'));
+		if (!$lang->active)
+			$this->errors[] = Tools::displayError('You cannot set this language as default language because it\'s disabled');
+	}
+
+	public function updateOptionPsCurrencyDefault($value)
+	{
+		Configuration::updateValue('PS_CURRENCY_DEFAULT', $value);
+		Currency::refreshCurrencies();
+	}
 }
@@ -0,0 +1,62 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminMaintenanceControllerCore extends AdminController
+{
+	public function __construct()
+	{
+		$this->className = 'Configuration';
+		$this->table = 'configuration';
+
+		parent::__construct();
+
+		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('General'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_SHOP_ENABLE' => array(
+						'title' => $this->l('Enable Shop'),
+						'desc' => $this->l('Activate or deactivate your shop. Deactivate your shop while you perform maintenance on it. Please note that the webservice will not be disabled'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_MAINTENANCE_IP' => array(
+						'title' => $this->l('Maintenance IP'),
+						'desc' => $this->l('IP addresses allowed to access the Front Office even if shop is disabled. Use a comma to separate them (e.g., 42.24.4.2,127.0.0.1,99.98.97.96)'),
+						'validation' => 'isGenericName',
+						'type' => 'maintenance_ip',
+						'size' => 30,
+						'default' => ''
+					),
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
+			),
+		);
+	}
+}
@@ -36,6 +36,11 @@ class AdminMetaControllerCore extends AdminController
 	{
 		parent::__construct();

+		$this->ht_file = _PS_ROOT_DIR_.'/.htaccess';
+		$this->rb_file = _PS_ROOT_DIR_.'/robots.txt';
+		$this->sm_file = _PS_ROOT_DIR_.'/sitemap.xml';
+		$this->rb_data = $this->getRobotsContent();
+
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');
 		$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
@@ -49,28 +54,64 @@ class AdminMetaControllerCore extends AdminController
 		$this->_group = 'GROUP BY a.id_meta';

 		$mod_rewrite = Tools::modRewriteActive();
+		$general_fields = array(
+			'PS_REWRITING_SETTINGS' => array(
+				'title' => $this->l('Friendly URL'),
+				'desc' => ($mod_rewrite ? $this->l('Enable only if your server allows URL rewriting (recommended)') : ''),
+				'validation' => 'isBool',
+				'cast' => 'intval',
+				'type' => 'rewriting_settings',
+				'mod_rewrite' => $mod_rewrite
+			),
+			'PS_CANONICAL_REDIRECT' => array(
+				'title' => $this->l('Automatically redirect to Canonical url'),
+				'desc' => $this->l('Recommended but your theme must be compliant'),
+				'validation' => 'isBool',
+				'cast' => 'intval',
+				'type' => 'bool'
+			),
+		);
+
+		if ($this->checkConfiguration($this->ht_file))
+			$general_fields['PS_HTACCESS_DISABLE_MULTIVIEWS'] = array(
+				'title' => $this->l('Disable apache multiviews'),
+				'desc' => $this->l('Enable this option only if you have problems with some pages URL rewriting.'),
+				'validation' => 'isBool',
+				'cast' => 'intval',
+				'type' => 'bool',
+			);
+
+		// Options to generate robot.txt
+		$robots_description = $this->l('Your file robots.txt MUST be in your website\'s root directory and nowhere else.');
+		$robots_description .= '<br />'.$this->l('eg: http://www.yoursite.com/robots.txt');
+		if ($this->checkConfiguration($this->rb_file))
+		{
+			$robots_description .= '<br />'.$this->l('Generate your "robots.txt" file by clicking on the following button (this will erase your old robots.txt file):');
+			$robots_submit = array('name' => 'submitRobots', 'title' => $this->l('Generate robots.txt file'));
+		}
+		else
+		{
+			$robots_description .= '<br />'.$this->l('Before being able to use this tool, you need to:');
+			$robots_description .= '<br />- '.$this->l('create a robots.txt blank file in your root dir');
+			$robots_description .= '<br />- '.$this->l(' give it write permissions (CHMOD 666 on Unix system)');
+		}
+
+		$robots_options = array(
+			'title' => $this->l('Robots file generation'),
+			'description' => $robots_description,
+		);
+
+		if (isset($robots_submit))
+			$robots_options['submit'] = $robots_submit;
+
+		// List of options
 		$this->options = array(
 			'general' => array(
 				'title' =>	$this->l('URLs Setup'),
-				'fields' =>	array(
-					'PS_REWRITING_SETTINGS' => array(
-						'title' => $this->l('Friendly URL'),
-						'desc' => ($mod_rewrite ? $this->l('Enable only if your server allows URL rewriting (recommended)') : ''),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'type' => 'rewriting_settings',
-						'mod_rewrite' => $mod_rewrite
-						),
-					'PS_CANONICAL_REDIRECT' => array(
-						'title' => $this->l('Automatically redirect to Canonical url'),
-						'desc' => $this->l('Recommended but your theme must be compliant'),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'type' => 'bool'
-						),
-				),
+				'fields' =>	$general_fields,
 				'submit' => array()
 			),
+			'robots' => $robots_options,
 			'routes' => array(
 				'title' =>	$this->l('Schema of URLs'),
 				'description' => $this->l('You can change here the pattern of your links. There are some available keywords for each route listed below, keywords with * are required. To add a keyword in URL use {keyword} syntax. You can add some text before or after the keyword IF the keyword is not empty with syntax {prepend:keyword:append}, for example {-hey-:meta_title} will add "-hey-my-title" in URL if meta title is set, or nothing. Friendly URL and rewriting Apache option must be activated on your web server to use this functionality.'),
@@ -225,10 +266,63 @@ class AdminMetaControllerCore extends AdminController
 			}
 			Hook::exec('actionAdminMetaSave');
 		}
+		else if (Tools::isSubmit('submitRobots'))
+			$this->generateRobotsFile();

 		return parent::postProcess();
 	}

+	public function generateRobotsFile()
+	{
+		if (!$write_fd = @fopen($this->rb_file, 'w'))
+			$this->errors[] = sprintf(Tools::displayError('Cannot write into file: %s. Please check write permissions.'), $this->rb_file);
+		else
+		{
+			// PS Comments
+			fwrite($write_fd, "# robots.txt automaticaly generated by PrestaShop e-commerce open-source solution\n");
+			fwrite($write_fd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n");
+			fwrite($write_fd, "# This file is to prevent the crawling and indexing of certain parts\n");
+			fwrite($write_fd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n");
+			fwrite($write_fd, "# and Google. By telling these \"robots\" where not to go on your site,\n");
+			fwrite($write_fd, "# you save bandwidth and server resources.\n");
+			fwrite($write_fd, "# For more information about the robots.txt standard, see:\n");
+			fwrite($write_fd, "# http://www.robotstxt.org/wc/robots.html\n");
+
+			//GoogleBot specific
+			fwrite($write_fd, "# GoogleBot specific\n");
+			fwrite($write_fd, "User-agent: Googlebot\n");
+			foreach ($this->rb_data['GB'] as $gb)
+				fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$gb."\n");
+
+			// User-Agent
+			fwrite($write_fd, "# All bots\n");
+			fwrite($write_fd, "User-agent: *\n");
+
+			// Directories
+			fwrite($write_fd, "# Directories\n");
+			foreach ($this->rb_data['Directories'] as $dir)
+				fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$dir."\n");
+
+			// Files
+			fwrite($write_fd, "# Files\n");
+			foreach ($this->rb_data['Files'] as $file)
+				fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$file."\n");
+
+			// Sitemap
+			fwrite($write_fd, "# Sitemap\n");
+			if (file_exists($this->sm_file))
+				if (filesize($this->sm_file))
+					fwrite(
+						$write_fd,
+						'Sitemap: '.(Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].__PS_BASE_URI__.'sitemap.xml'."\n"
+					);
+			fwrite($write_fd, "\n");
+			fclose($write_fd);
+
+			$this->redirect_after = self::$currentIndex.'&conf=4&token='.$this->token;
+		}
+	}
+
 	public function getList($id_lang, $orderBy = null, $orderWay = null, $start = 0, $limit = null, $id_lang_shop = false)
 	{
 		parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, Context::getContext()->shop->id);
@@ -268,7 +362,7 @@ class AdminMetaControllerCore extends AdminController
 	public function updateOptionPsRewritingSettings()
 	{
 		Configuration::updateValue('PS_REWRITING_SETTINGS', (int)Tools::getValue('PS_REWRITING_SETTINGS'));
-		Tools::generateHtaccess();
+		Tools::generateHtaccess($this->ht_file, null, null, '', Tools::getValue('PS_HTACCESS_DISABLE_MULTIVIEWS'));
 	}

 	public function updateOptionPsRouteProductRule()
@@ -340,4 +434,55 @@ class AdminMetaControllerCore extends AdminController
 		$this->addFieldRoute('cms_category_rule', $this->l('Route to CMS category'));
 		$this->addFieldRoute('module', $this->l('Route to modules'));
 	}
+
+	/**
+	 * Check if a file is writable
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function checkConfiguration($file)
+	{
+		if (file_exists($file))
+			return is_writable($file);
+		return is_writable(dirname($file));
+	}
+
+	public function getRobotsContent()
+	{
+		$tab = array();
+
+		// Directories
+		$tab['Directories'] = array('classes/', 'config/', 'download/', 'mails/', 'modules/', 'translations/', 'tools/');
+
+		// Files
+		$disallow_controllers = array(
+			'addresses', 'address', 'authentication', 'cart', 'discount', 'footer',
+			'get-file', 'header', 'history', 'identity', 'images.inc', 'init', 'my-account', 'order', 'order-opc',
+			'order-slip', 'order-detail', 'order-follow', 'order-return', 'order-confirmation', 'pagination', 'password',
+			'pdf-invoice', 'pdf-order-return', 'pdf-order-slip', 'product-sort', 'search', 'statistics','attachment', 'guest-tracking'
+		);
+
+		// Rewrite files
+		$tab['Files'] = array();
+		if (Configuration::get('PS_REWRITING_SETTINGS'))
+		{
+			$sql = 'SELECT ml.url_rewrite
+					FROM '._DB_PREFIX_.'meta m
+					INNER JOIN '._DB_PREFIX_.'meta_lang ml ON ml.id_meta = m.id_meta
+					WHERE m.page IN (\''.implode('\', \'', $disallow_controllers).'\')';
+			if ($results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
+				foreach ($results as $row)
+					$tab['Files'][] = $row['url_rewrite'];
+		}
+
+		$tab['GB'] = array(
+			'*orderby=','*orderway=','*tag=','*id_currency=','*search_query=','*id_lang=','*back=','*utm_source=','*utm_medium=','*utm_campaign=','*n='
+		);
+
+		foreach ($disallow_controllers as $controller)
+			$tab['GB'][] = '*controller='.$controller;
+
+		return $tab;
+	}
 }
@@ -0,0 +1,184 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminOrderPreferencesControllerCore extends AdminController
+{
+	public function __construct()
+	{
+		$this->className = 'Configuration';
+		$this->table = 'configuration';
+
+		parent::__construct();
+
+		// List of CMS tabs
+		$cms_tab = array(0 => array(
+			'id' => 0,
+			'name' => $this->l('None')
+		));
+		foreach (CMS::listCms($this->context->language->id) as $cms_file)
+			$cms_tab[] = array('id' => $cms_file['id_cms'], 'name' => $cms_file['meta_title']);
+
+		// List of order process types
+		$order_process_type = array(
+			array(
+				'value' => PS_ORDER_PROCESS_STANDARD,
+				'name' => $this->l('Standard (5 steps)')
+			),
+			array(
+				'value' => PS_ORDER_PROCESS_OPC,
+				'name' => $this->l('One page checkout')
+			)
+		);
+
+		// Tax list
+		$taxes[] = array('id' => 0, 'name' => $this->l('None'));
+		foreach (Tax::getTaxes($this->context->language->id) as $tax)
+			$taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']);
+
+		$this->options = array(
+			'general' => array(
+				'title' =>	$this->l('General'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_ORDER_PROCESS_TYPE' => array(
+						'title' => $this->l('Order process type'),
+						'desc' => $this->l('You can choose the order process type as either standard (5 steps) or One Page Checkout'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'select',
+						'list' => $order_process_type,
+						'identifier' => 'value'
+					),
+					'PS_GUEST_CHECKOUT_ENABLED' => array(
+						'title' => $this->l('Enable guest checkout'),
+						'desc' => $this->l('Your guest can make an order without registering'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_PURCHASE_MINIMUM' => array(
+						'title' => $this->l('Minimum purchase total required in order to validate order:'),
+						'desc' => $this->l('Set to 0 to disable this feature'),
+						'validation' => 'isFloat',
+						'cast' => 'floatval',
+						'type' => 'price'
+					),
+					'PS_ALLOW_MULTISHIPPING' => array(
+						'title' => $this->l('Allow multi-shipping'),
+						'desc' => $this->l('Allow the customer to ship his order to multiple addresses. This option will transform the customer cart in one or more orders.'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_SHIP_WHEN_AVAILABLE' => array(
+						'title' => $this->l('Delayed shipping'),
+						'desc' => $this->l('Allow the customer to split his order. One with the products "in stock", and an other with the other products. This option will transform the customer cart in two orders.'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_CONDITIONS' => array(
+						'title' => $this->l('Terms of service'),
+						'desc' => $this->l('Require customers to accept or decline terms of service before processing the order'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool',
+						'js' => array(
+							'on' => 'onchange="changeCMSActivationAuthorization()"',
+							'off' => 'onchange="changeCMSActivationAuthorization()"'
+						)
+					),
+					'PS_CONDITIONS_CMS_ID' => array(
+						'title' => $this->l('Conditions of use CMS page'),
+						'desc' => $this->l('Choose the Conditions of use CMS page'),
+						'validation' => 'isInt',
+						'type' => 'select',
+						'list' => $cms_tab,
+						'identifier' => 'id',
+						'cast' => 'intval'
+					),
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
+			),
+			'gift' => array(
+				'title' =>	$this->l('Gift options'),
+				'icon' =>	'tab-preferences',
+				'fields' =>	array(
+					'PS_GIFT_WRAPPING' => array(
+						'title' => $this->l('Offer gift-wrapping'),
+						'desc' => $this->l('Suggest gift-wrapping to customer and possibility of leaving a message'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_GIFT_WRAPPING_PRICE' => array(
+						'title' => $this->l('Gift-wrapping price'),
+						'desc' => $this->l('Set a price for gift-wrapping'),
+						'validation' => 'isPrice',
+						'cast' => 'floatval',
+						'type' => 'price'
+					),
+					'PS_GIFT_WRAPPING_TAX' => array(
+						'title' => $this->l('Gift-wrapping tax'),
+						'desc' => $this->l('Set a tax for gift-wrapping'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'select',
+						'list' => $taxes,
+						'identifier' => 'id'
+					),
+					'PS_RECYCLABLE_PACK' => array(
+						'title' => $this->l('Offer recycled packaging'),
+						'desc' => $this->l('Suggest recycled packaging to customer'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
+					'PS_GIFT_WRAPPING_ACCOUNT_NUMBER' => array(
+						'title' => $this->l('Gift-wrapping account number'),
+						'desc' => $this->l('Set an account number for your gift-wrapping (used for accounting)'),
+						'validation' => 'isString',
+						'type' => 'text',
+						'size' => 30,
+					),
+				),
+				'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
+			),
+		);
+	}
+
+	/**
+	 * This method is called before we start to update options configuration
+	 */
+	public function beforeUpdateOptions()
+	{
+		$sql = 'SELECT `id_cms` FROM `'._DB_PREFIX_.'cms`
+				WHERE id_cms = '.(int)Tools::getValue('PS_CONDITIONS_CMS_ID');
+		if (Tools::getValue('PS_CONDITIONS') && (Tools::getValue('PS_CONDITIONS_CMS_ID') == 0 || !Db::getInstance()->getValue($sql)))
+			$this->errors[] = Tools::displayError('Assign a valid CMS page if you want it to be read.');
+	}
+}
@@ -35,6 +35,67 @@ class AdminPPreferencesControllerCore extends AdminController
 		parent::__construct();

 		$this->options = array(
+			'products' => array(
+				'title' =>	$this->l('Products (general)'),
+				'fields' =>	array(
+					'PS_CATALOG_MODE' => array(
+						'title' => $this->l('Catalog mode:'),
+						'desc' => $this->l('When active, all features for shopping will be disabled'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'required' => false,
+						'type' => 'bool'
+					),
+					'PS_COMPARATOR_MAX_ITEM' => array(
+						'title' => $this->l('Max items in the comparator:'),
+						'desc' => $this->l('Specify here the threshold from which be displayed a message announcing an upcoming out of stock.').' '.$this->l('Set to 0 to disable this feature'),
+						'validation' => 'isUnsignedId',
+						'required' => true,
+						'cast' => 'intval',
+						'type' => 'text'
+					),
+					'PS_NB_DAYS_NEW_PRODUCT' => array(
+						'title' => $this->l('Number of days during which the product is considered \'new\':'),
+						'validation' => 'isUnsignedInt',
+						'cast' => 'intval',
+						'type' => 'text'
+					),
+					'PS_CART_REDIRECT' => array(
+						'title' => $this->l('Re-direction after adding product to cart:'),
+						'desc' => $this->l('Concerns only the non-AJAX version of the cart'),
+						'cast' => 'intval',
+						'show' => true,
+						'required' => false,
+						'type' => 'radio',
+						'validation' => 'isBool',
+						'choices' => array(
+							0 => $this->l('previous page'),
+							1 => $this->l('cart summary')
+						)
+					),
+					'PS_PRODUCT_SHORT_DESC_LIMIT' => array(
+						'title' => $this->l('Short description max size'),
+						'desc' => $this->l('Set the maximum size of product short description'),
+						'validation' => 'isInt',
+						'cast' => 'intval',
+						'type' => 'text',
+						'suffix' => $this->l('characters'),
+					),
+					'PS_QTY_DISCOUNT_ON_COMBINATION' => array(
+						'title' => $this->l('Quantity discounts based on:'),
+						'desc' => $this->l('How to calculate quantity discounts'),
+						'cast' => 'intval',
+						'show' => true,
+						'required' => false,
+						'type' => 'radio',
+						'validation' => 'isBool',
+						'choices' => array(
+							0 => $this->l('Products'),
+							1 => $this->l('Combinations')
+						)
+					)
+				),
+			),
 			'order_by_pagination' => array(
 				'title' =>	$this->l('Pagination'),
 				'fields' =>	array(
@@ -121,73 +182,6 @@ class AdminPPreferencesControllerCore extends AdminController
 					)
 				)
 			),
-			'product_images' => array(
-				'title' =>	$this->l('Products images'),
-				'fields' =>	array(
-					'PS_IMAGE_GENERATION_METHOD' => array(
-						'title' => $this->l('Image generated by:'),
-						'validation' => 'isUnsignedId',
-						'required' => false,
-						'cast' => 'intval',
-						'type' => 'select',
-						'list' => array(
-							array(
-								'id' => '0',
-								'name' => $this->l('auto')
-							),
-							array(
-								'id' => '1',
-								'name' => $this->l('width')
-							),
-							array(
-								'id' => '2',
-								'name' => $this->l('height')
-							)
-						),
-						'identifier' => 'id',
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'PS_PRODUCT_PICTURE_MAX_SIZE' => array(
-						'title' => $this->l('Maximum size of product pictures:'),
-						'desc' => $this->l('The maximum size of pictures uploadable by customers (in Bytes)'),
-						'validation' => 'isUnsignedId',
-						'required' => true,
-						'cast' => 'intval',
-						'type' => 'text',
-						'suffix' => $this->l('bytes'),
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'PS_PRODUCT_PICTURE_WIDTH' => array(
-						'title' => $this->l('Product pictures width:'),
-						'desc' => $this->l('The maximum width of pictures uploadable by customers'),
-						'validation' => 'isUnsignedId',
-						'required' => true,
-						'cast' => 'intval',
-						'type' => 'text',
-						'suffix' => 'px',
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'PS_PRODUCT_PICTURE_HEIGHT' => array(
-						'title' => $this->l('Product pictures height:'),
-						'desc' => $this->l('The maximum height of pictures uploadable by customers'),
-						'validation' => 'isUnsignedId',
-						'required' => true,
-						'cast' => 'intval',
-						'type' => 'text',
-						'suffix' => 'px',
-						'visibility' => Shop::CONTEXT_ALL
-					),
-					'PS_LEGACY_IMAGES' => array(
-						'title' => $this->l('Use the legacy image filesystem:'),
-						'desc' => $this->l('This should be set to yes unless you successfully moved images in Preferences > Images tab'),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'required' => false,
-						'type' => 'bool',
-						'visibility' => Shop::CONTEXT_ALL
-					),
-				)
-			),
 			'stock' => array(
 				'title' =>	$this->l('Products stock'),
 				'fields' =>	array(
@@ -220,74 +214,6 @@ class AdminPPreferencesControllerCore extends AdminController
 						'type' => 'bool',
 						'visibility' => Shop::CONTEXT_ALL
 					),
-				)
-			),
-			'products' => array(
-				'title' =>	$this->l('Products (general)'),
-				'fields' =>	array(
-					'PS_CATALOG_MODE' => array(
-						'title' => $this->l('Catalog mode:'),
-						'desc' => $this->l('When active, all features for shopping will be disabled'),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'required' => false,
-						'type' => 'bool'
-					),
-					'PS_COMPARATOR_MAX_ITEM' => array(
-						'title' => $this->l('Max items in the comparator:'),
-						'desc' => $this->l('Specify here the threshold from which be displayed a message announcing an upcoming out of stock.').' '.$this->l('Set to 0 to disable this feature'),
-						'validation' => 'isUnsignedId',
-						'required' => true,
-						'cast' => 'intval',
-						'type' => 'text'
-					),
-					'PS_PURCHASE_MINIMUM' => array(
-						'title' => $this->l('Minimum purchase total required in order to validate order:'),
-						'desc' => $this->l('Set to 0 to disable this feature'),
-						'validation' => 'isFloat',
-						'cast' => 'floatval',
-						'type' => 'price'
-					),
-					'PS_NB_DAYS_NEW_PRODUCT' => array(
-						'title' => $this->l('Number of days during which the product is considered \'new\':'),
-						'validation' => 'isUnsignedInt',
-						'cast' => 'intval',
-						'type' => 'text'
-					),
-					'PS_CART_REDIRECT' => array(
-						'title' => $this->l('Re-direction after adding product to cart:'),
-						'desc' => $this->l('Concerns only the non-AJAX version of the cart'),
-						'cast' => 'intval',
-						'show' => true,
-						'required' => false,
-						'type' => 'radio',
-						'validation' => 'isBool',
-						'choices' => array(
-							0 => $this->l('previous page'),
-							1 => $this->l('cart summary')
-						)
-					),
-					'PS_PRODUCT_SHORT_DESC_LIMIT' => array(
-						'title' => $this->l('Short description max size'),
-						'desc' => $this->l('Set the maximum size of product short description'),
-						'validation' => 'isInt',
-						'cast' => 'intval',
-						'type' => 'text',
-						'suffix' => $this->l('characters')
-					),
-					'PS_QTY_DISCOUNT_ON_COMBINATION' => array(
-						'title' => $this->l('Quantity discounts based on:'),
-						'desc' => $this->l('How to calculate quantity discounts'),
-						'cast' => 'intval',
-						'show' => true,
-						'required' => false,
-						'type' => 'radio',
-						'validation' => 'isBool',
-						'choices' => array(
-							0 => $this->l('Products'),
-							1 => $this->l('Combinations')
-						)
-					)
 				),
 				'bottom' => '<script type="text/javascript">stockManagementActivationAuthorization();</script>',
 				'submit' => array()
@@ -192,7 +192,7 @@ class AdminPerformanceControllerCore extends AdminController
 			'input' => array(
 				array(
 					'type' => 'hidden',
-					'name' => 'ccc_up'
+					'name' => 'ccc_up',
 				),
 				array(
 					'type' => 'radio',
@@ -288,6 +288,26 @@ class AdminPerformanceControllerCore extends AdminController
 							'label' => $this->l('Keep W3C validation')
 						)
 					)
+				),
+				array(
+					'type' => 'radio',
+					'label' => $this->l('Apache optimization'),
+					'name' => 'PS_HTACCESS_CACHE_CONTROL',
+					'class' => 't',
+					'desc' => $this->l('This will add directives to your .htaccess file which should improve caching and compression.'),
+					'is_bool' => true,
+					'values' => array(
+						array(
+							'id' => 'PS_HTACCESS_CACHE_CONTROL_1',
+							'value' => 1,
+							'label' => $this->l('Yes'),
+						),
+						array(
+							'id' => 'PS_HTACCESS_CACHE_CONTROL_0',
+							'value' => 0,
+							'label' => $this->l('No'),
+						),
+					),
 				)
 			)
 		);
@@ -297,6 +317,8 @@ class AdminPerformanceControllerCore extends AdminController
 		$this->fields_value['PS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HTML_THEME_COMPRESSION');
 		$this->fields_value['PS_JS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_JS_HTML_THEME_COMPRESSION');
 		$this->fields_value['PS_HIGH_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION');
+		$this->fields_value['PS_HTACCESS_CACHE_CONTROL'] = Configuration::get('PS_HTACCESS_CACHE_CONTROL');
+		$this->fields_value['ccc_up'] = 1;
 	}

 	public function initFieldsetMediaServer()
@@ -585,10 +607,15 @@ class AdminPerformanceControllerCore extends AdminController
 					!Configuration::updateValue('PS_JS_THEME_CACHE', (int)Tools::getValue('PS_JS_THEME_CACHE')) ||
 					!Configuration::updateValue('PS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HTML_THEME_COMPRESSION')) ||
 					!Configuration::updateValue('PS_JS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_JS_HTML_THEME_COMPRESSION')) ||
-					!Configuration::updateValue('PS_HIGH_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HIGH_HTML_THEME_COMPRESSION')))
+					!Configuration::updateValue('PS_HIGH_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HIGH_HTML_THEME_COMPRESSION')) ||
+					!Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL')))
 					$this->errors[] = Tools::displayError('Unknown error.');
 				else
+				{
 					$redirecAdmin = true;
+					if (Configuration::get('PS_HTACCESS_CACHE_CONTROL'))
+						Tools::generateHtaccess();
+				}
 			}
 			else
 				$this->errors[] = Tools::displayError('You do not have permission to edit here.');
@@ -34,40 +34,11 @@ class AdminPreferencesControllerCore extends AdminController
 		$this->className = 'Configuration';
 		$this->table = 'configuration';

-		$max_upload = (int)ini_get('upload_max_filesize');
-		$max_post = (int)ini_get('post_max_size');
-		$upload_mb = min($max_upload, $max_post);
+

 		// Prevent classes which extend AdminPreferences to load useless data
 		if (get_class($this) == 'AdminPreferencesController')
 		{
-			$timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone');
-			$taxes[] = array('id' => 0, 'name' => $this->l('None'));
-			foreach (Tax::getTaxes($this->context->language->id) as $tax)
-				$taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']);
-
-			$order_process_type = array(
-				array(
-					'value' => PS_ORDER_PROCESS_STANDARD,
-					'name' => $this->l('Standard (5 steps)')
-				),
-				array(
-					'value' => PS_ORDER_PROCESS_OPC,
-					'name' => $this->l('One page checkout')
-				)
-			);
-
-			$registration_process_type = array(
-				array(
-					'value' => PS_REGISTRATION_PROCESS_STANDARD,
-					'name' => $this->l('Only account creation')
-				),
-				array(
-					'value' => PS_REGISTRATION_PROCESS_AIO,
-					'name' => $this->l('Standard (account creation and address creation)')
-				)
-			);
-
 			$round_mode = array(
 				array(
 					'value' => PS_ROUND_UP,
@@ -83,31 +54,7 @@ class AdminPreferencesControllerCore extends AdminController
 				)
 			);

-			$cms_tab = array(0 =>
-				array(
-					'id' => 0,
-					'name' => $this->l('None')
-				)
-			);
-			foreach (CMS::listCms($this->context->language->id) as $cms_file)
-				$cms_tab[] = array('id' => $cms_file['id_cms'], 'name' => $cms_file['meta_title']);
-
 			$fields = array(
-				'PS_SHOP_ENABLE' => array(
-					'title' => $this->l('Enable Shop'),
-					'desc' => $this->l('Activate or deactivate your shop. Deactivate your shop while you perform maintenance on it. Please note that the webservice will not be disabled'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_MAINTENANCE_IP' => array(
-					'title' => $this->l('Maintenance IP'),
-					'desc' => $this->l('IP addresses allowed to access the Front Office even if shop is disabled. Use a comma to separate them (e.g., 42.24.4.2,127.0.0.1,99.98.97.96)'),
-					'validation' => 'isGenericName',
-					'type' => 'maintenance_ip',
-					'size' => 30,
-					'default' => ''
-				),
 				'PS_SSL_ENABLED' => array(
 					'title' => $this->l('Enable SSL'),
 					'desc' => $this->l('If your hosting provider allows SSL, you can activate SSL encryption (https://) for customer account identification and order processing'),
@@ -116,15 +63,6 @@ class AdminPreferencesControllerCore extends AdminController
 					'type' => 'bool',
 					'default' => '0'
 				),
-				'PS_COOKIE_CHECKIP' => array(
-					'title' => $this->l('Check IP on the cookie'),
-					'desc' => $this->l('Check the IP address of the cookie in order to avoid your cookie being stolen'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool',
-					'default' => '0',
-					'visibility' => Shop::CONTEXT_ALL
-				),
 				'PS_TOKEN_ENABLE' => array(
 					'title' => $this->l('Increase Front Office security'),
 					'desc' => $this->l('Enable or disable token on the Front Office in order to improve PrestaShop security'),
@@ -134,152 +72,6 @@ class AdminPreferencesControllerCore extends AdminController
 					'default' => '0',
 					'visibility' => Shop::CONTEXT_ALL
 				),
-				'PS_HELPBOX' => array(
-					'title' => $this->l('Back Office help boxes'),
-					'desc' => $this->l('Enable yellow help boxes which are displayed under form fields in the Back Office'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool',
-					'visibility' => Shop::CONTEXT_ALL
-				),
-				'PS_COOKIE_LIFETIME_FO' => array(
-					'title' => $this->l('Lifetime of the Front Office cookie'),
-					'desc' => $this->l('Indicate the number of hours'),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'text',
-					'default' => '480',
-					'visibility' => Shop::CONTEXT_ALL
-				),
-				'PS_COOKIE_LIFETIME_BO' => array(
-					'title' => $this->l('Lifetime of the Back Office cookie'),
-					'desc' => $this->l('Indicate the number of hours'),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'text',
-					'default' => '480',
-					'visibility' => Shop::CONTEXT_ALL
-				),
-				'PS_B2B_ENABLE' => array(
-					'title' => $this->l('Enable B2B mode'),
-					'desc' => $this->l('Activate or deactivate B2B mode. When this option is enable some features about B2B appear.'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_ORDER_PROCESS_TYPE' => array(
-					'title' => $this->l('Order process type'),
-					'desc' => $this->l('You can choose the order process type as either standard (5 steps) or One Page Checkout'),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'select',
-					'list' => $order_process_type,
-					'identifier' => 'value'
-				),
-				'PS_ALLOW_MULTISHIPPING' => array(
-					'title' => $this->l('Allow multi-shipping'),
-					'desc' => $this->l('Allow the customer to ship his order to multiple addresses. This option will transform the customer cart in one or more orders.'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_SHIP_WHEN_AVAILABLE' => array(
-					'title' => $this->l('Delayed shipping'),
-					'desc' => $this->l('Allow the customer to split his order. One with the products "in stock", and an other with the other products. This option will transform the customer cart in two orders.'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_REGISTRATION_PROCESS_TYPE' => array(
-					'title' => $this->l('Registration process type'),
-					'desc' => $this->l('The "Only account creation" step register process allows the customer to register faster, and create his address later.'),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'select',
-					'list' => $registration_process_type,
-					'identifier' => 'value'
-				),
-				'PS_GUEST_CHECKOUT_ENABLED' => array(
-					'title' => $this->l('Enable guest checkout'),
-					'desc' => $this->l('Your guest can make an order without registering'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_CONDITIONS' => array(
-					'title' => $this->l('Terms of service'),
-					'desc' => $this->l('Require customers to accept or decline terms of service before processing the order'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool',
-					'js' => array(
-						'on' => 'onchange="changeCMSActivationAuthorization()"',
-						'off' => 'onchange="changeCMSActivationAuthorization()"'
-					)
-				),
-				'PS_CONDITIONS_CMS_ID' => array(
-					'title' => $this->l('Conditions of use CMS page'),
-					'desc' => $this->l('Choose the Conditions of use CMS page'),
-					'validation' => 'isInt',
-					'type' => 'select',
-					'list' => $cms_tab,
-					'identifier' => 'id',
-					'cast' => 'intval'
-				),
-				'PS_GIFT_WRAPPING' => array(
-					'title' => $this->l('Offer gift-wrapping'),
-					'desc' => $this->l('Suggest gift-wrapping to customer and possibility of leaving a message'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_GIFT_WRAPPING_PRICE' => array(
-					'title' => $this->l('Gift-wrapping price'),
-					'desc' => $this->l('Set a price for gift-wrapping'),
-					'validation' => 'isPrice',
-					'cast' => 'floatval',
-					'type' => 'price'
-				),
-				'PS_GIFT_WRAPPING_TAX' => array(
-					'title' => $this->l('Gift-wrapping tax'),
-					'desc' => $this->l('Set a tax for gift-wrapping'),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'select',
-					'list' => $taxes,
-					'identifier' => 'id'
-				),
-				'PS_GIFT_WRAPPING_ACCOUNT_NUMBER' => array(
-					'title' => $this->l('Gift-wrapping account number'),
-					'desc' => $this->l('Set an account number for your gift-wrapping (used for accounting)'),
-					'validation' => 'isString',
-					'type' => 'text',
-					'size' => 30,
-				),
-
-				'PS_ATTACHMENT_MAXIMUM_SIZE' => array(
-					'title' => $this->l('Attachment maximum size'),
-					'desc' => $this->l('Set the maximum size of attachment files (in MegaBytes).').' '.$this->l('Maximum:').' '.
-						((int)str_replace('M', '', ini_get('post_max_size')) > (int)str_replace('M', '', ini_get('upload_max_filesize')) ? ini_get('upload_max_filesize') : ini_get('post_max_size')),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'text',
-					'default' => '2'
-				),
-				'PS_RECYCLABLE_PACK' => array(
-					'title' => $this->l('Offer recycled packaging'),
-					'desc' => $this->l('Suggest recycled packaging to customer'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_CART_FOLLOWING' => array(
-					'title' => $this->l('Cart re-display at login'),
-					'desc' => $this->l('After customer logs in, recall and display contents of his/her last shopping cart'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
 				'PS_PRICE_ROUND_MODE' => array(
 					'title' => $this->l('Round mode'),
 					'desc' => $this->l('You can choose how to round prices: always round superior; always round inferior, or classic rounding'),
@@ -289,21 +81,6 @@ class AdminPreferencesControllerCore extends AdminController
 					'list' => $round_mode,
 					'identifier' => 'value'
 				),
-				'PRESTASTORE_LIVE' => array(
-					'title' => $this->l('Automatically check for module updates'),
-					'desc' => $this->l('New modules and updates are displayed on the modules page'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool',
-					'visibility' => Shop::CONTEXT_ALL
-				),
-				'PS_HIDE_OPTIMIZATION_TIPS' => array(
-					'title' => $this->l('Hide optimization tips'),
-					'desc' => $this->l('Hide optimization tips on the back office homepage'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
 				'PS_DISPLAY_SUPPLIERS' => array(
 					'title' => $this->l('Display suppliers and manufacturers'),
 					'desc' => $this->l('Display manufacturers and suppliers list even if corresponding blocks are disabled'),
@@ -311,57 +88,8 @@ class AdminPreferencesControllerCore extends AdminController
 					'cast' => 'intval',
 					'type' => 'bool'
 				),
-				'PS_SHOW_NEW_ORDERS' => array(
-					'title' => $this->l('Show notifications for new orders'),
-					'desc' => $this->l('This will display notifications when new orders will be made on your shop'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_SHOW_NEW_CUSTOMERS' => array(
-					'title' => $this->l('Show notifications for new customers'),
-					'desc' => $this->l('This will display notifications when new customers will register on your shop'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_SHOW_NEW_MESSAGES' => array(
-					'title' => $this->l('Show notifications for new messages'),
-					'desc' => $this->l('This will display notifications when new messages will be posted on your shop'),
-					'validation' => 'isBool',
-					'cast' => 'intval',
-					'type' => 'bool'
-				),
-				'PS_LIMIT_UPLOAD_FILE_VALUE' => array(
-					'title' => $this->l('Limit upload file value'),
-					'desc' => $this->l('Define the limit upload for a downloadable product, this value have to be inferior or egal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'text',
-					'suffix' => $this->l('Megabits'),
-					'default' => '1'
-				),
-				'PS_LIMIT_UPLOAD_IMAGE_VALUE' => array(
-					'title' => $this->l('Limit upload image value'),
-					'desc' => $this->l('Define the limit upload for an image, this value have to be inferior or egal to your server\'s maximum upload file ').sprintf('(%s MB).', $upload_mb),
-					'validation' => 'isInt',
-					'cast' => 'intval',
-					'type' => 'text',
-					'suffix' => $this->l('Megabits'),
-					'default' => '1'
-				),
 			);

-			if (function_exists('date_default_timezone_set'))
-				$fields['PS_TIMEZONE'] = array(
-					'title' => $this->l('Time Zone:'),
-					'validation' => 'isAnything',
-					'type' => 'select',
-					'list' => $timezones,
-					'identifier' => 'name',
-					'visibility' => Shop::CONTEXT_ALL
-				);
-
 			// No HTTPS activation if you haven't already.
 			if (!Tools::usingSecureMode())
 			{
@@ -376,95 +104,10 @@ class AdminPreferencesControllerCore extends AdminController
 					'icon' =>	'tab-preferences',
 					'fields' =>	$fields,
 					'submit' => array('title' => $this->l('   Save   '), 'class' => 'button'),
-
 				),
 			);
 		}

 		parent::__construct();
 	}
-
-	public function postProcess()
-	{
-		$upload_max_size = (int)str_replace('M', '', ini_get('upload_max_filesize'));
-		$post_max_size = (int)str_replace('M', '', ini_get('post_max_size'));
-		$max_size = $upload_max_size < $post_max_size ? $upload_max_size : $post_max_size;
-
-		if (Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE') > $max_size || Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE') > $max_size)
-		{
-			$this->errors[] = Tools::displayError('The limit choosen is superior to the server\'s maximum upload file You need to improve the limit of your server.');
-			return;
-		}
-
-		if (Tools::getIsset('PS_LIMIT_UPLOAD_FILE_VALUE') && !Tools::getValue('PS_LIMIT_UPLOAD_FILE_VALUE'))
-			$_POST['PS_LIMIT_UPLOAD_FILE_VALUE'] = 1;
-
-		if (Tools::getIsset('PS_LIMIT_UPLOAD_IMAGE_VALUE') && !Tools::getValue('PS_LIMIT_UPLOAD_IMAGE_VALUE'))
-			$_POST['PS_LIMIT_UPLOAD_IMAGE_VALUE'] = 1;
-
-		Tools::clearCache($this->context->smarty);
-		parent::postProcess();
-	}
-
-	protected function getConf($fields, $languages)
-	{
-		$tab['_MEDIA_SERVER_1_'] = _MEDIA_SERVER_1_;
-		$tab['_MEDIA_SERVER_2_'] = _MEDIA_SERVER_2_;
-		$tab['_MEDIA_SERVER_3_'] = _MEDIA_SERVER_3_;
-
-		return $tab;
-	}
-
-	/**
-	 * This method is called before we start to update options configuration
-	 */
-	public function beforeUpdateOptions()
-	{
-		if (get_class($this) != 'AdminPreferences')
-			return;
-
-		$sql = 'SELECT `id_cms` FROM `'._DB_PREFIX_.'cms`
-				WHERE id_cms = '.(int)Tools::getValue('PS_CONDITIONS_CMS_ID');
-		if (Tools::getValue('PS_CONDITIONS') && (Tools::getValue('PS_CONDITIONS_CMS_ID') == 0 || !Db::getInstance()->getValue($sql)))
-			$this->errors[] = Tools::displayError('Assign a valid CMS page if you want it to be read.');
-	}
-
-	/**
-	 * Update PS_ATTACHMENT_MAXIMUM_SIZE
-	 */
-	public function updateOptionPsAttachementMaximumSize($value)
-	{
-		if (!$value)
-			return;
-
-		$upload_max_size = (int)str_replace('M', '', ini_get('upload_max_filesize'));
-		$post_max_size = (int)str_replace('M', '', ini_get('post_max_size'));
-		$max_size = $upload_max_size < $post_max_size ? $upload_max_size : $post_max_size;
-		$value = ($max_size < Tools::getValue('PS_ATTACHMENT_MAXIMUM_SIZE')) ? $max_size : Tools::getValue('PS_ATTACHMENT_MAXIMUM_SIZE');
-		Configuration::update('PS_ATTACHMENT_MAXIMUM_SIZE', $value);
-	}
-
-	/**
-	 * Update PS_B2B_ENABLE and enables / disables the associated tabs
-	 * @param $value integer Value of option
-	 */
-	public function updateOptionPsB2bEnable($value)
-	{
-		$value = (int)$value;
-
-		$tabs_class_name = array('AdminOutstanding');
-		if (!empty($tabs_class_name))
-		{
-			foreach ($tabs_class_name as $tab_class_name)
-			{
-				$tab = Tab::getInstanceFromClassName($tab_class_name);
-				if (Validate::isLoadedObject($tab))
-				{
-					$tab->active = $value;
-					$tab->save();
-				}
-			}
-		}
-		Configuration::updateValue('PS_B2B_ENABLE', $value);
-	}
 }
@@ -27,13 +27,33 @@

 class AdminSearchConfControllerCore extends AdminController
 {
+	protected $toolbar_scroll = false;
+
 	public function __construct()
 	{
-		$this->className = 'Configuration';
-		$this->table = 'configuration';
+		$this->table = 'alias';
+		$this->className = 'Alias';
+		$this->lang = false;
+		$this->requiredDatabase = true;

 		parent::__construct();

+		// Alias fields
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
+		if (!Tools::getValue('realedit'))
+			$this->deleted = false;
+
+		$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
+
+		$this->fieldsDisplay = array(
+			'alias' => array('title' => $this->l('Aliases'), 'width' => 'auto'),
+			'search' => array('title' => $this->l('Search'), 'width' => 100),
+			'active' => array('title' => $this->l('Status'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
+		);
+
+		// Search options
 		$current_file_name = array_reverse(explode('/', $_SERVER['SCRIPT_NAME']));
 		$cron_url = Tools::getHttpHost(true, true).__PS_BASE_URI__.
 			substr($_SERVER['SCRIPT_NAME'], strlen(__PS_BASE_URI__), -strlen($current_file_name['0'])).
@@ -167,4 +187,99 @@ class AdminSearchConfControllerCore extends AdminController
 			),
 		);
 	}
+
+	public function initProcess()
+	{
+		parent::initProcess();
+		// This is a composite page, we don't want the "options" display mode
+		if ($this->display == 'options')
+			$this->display = '';
+	}
+
+	/**
+	 * Function used to render the options for this controller
+	 */
+	public function renderOptions()
+	{
+		if ($this->options && is_array($this->options))
+		{
+			$helper = new HelperOptions($this);
+			$this->setHelperDisplay($helper);
+			$helper->toolbar_scroll = true;
+			$helper->toolbar_btn = array('save' => array(
+				'href' => '#',
+				'desc' => $this->l('Save')
+			));
+			$helper->id = $this->id;
+			$helper->tpl_vars = $this->tpl_option_vars;
+			$options = $helper->generateOptions($this->options);
+
+			return $options;
+		}
+	}
+
+	public function renderForm()
+	{
+		$this->fields_form = array(
+			'legend' => array(
+				'title' => $this->l('Aliases'),
+				'image' => '../img/admin/search.gif'
+			),
+			'input' => array(
+				array(
+					'type' => 'text',
+					'label' => $this->l('Alias:'),
+					'name' => 'alias',
+					'size' => 40,
+					'required' => true,
+					'desc' => array(
+						$this->l('Enter each alias separated by a comma (\',\') (e.g., \'prestshop,preztashop,prestasohp\')'),
+						$this->l('Forbidden characters: <>;=#{}')
+					)
+				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('Result:'),
+					'name' => 'search',
+					'size' => 15,
+					'required' => true,
+					'desc' => $this->l('Search this word instead.')
+				)
+			),
+			'submit' => array(
+				'title' => $this->l('   Save   '),
+				'class' => 'button'
+			)
+		);
+
+		$this->fields_value = array('alias' => $this->object->getAliases());
+
+		return parent::renderForm();
+	}
+
+	public function processSave($token)
+	{
+		$search = strval(Tools::getValue('search'));
+		$string = strval(Tools::getValue('alias'));
+		$aliases = explode(',', $string);
+		if (empty($search) || empty($string))
+			$this->errors[] = $this->l('aliases and result are both required');
+		if (!Validate::isValidSearch($search))
+			$this->errors[] = $search.' '.$this->l('is not a valid result');
+		foreach ($aliases as $alias)
+			if (!Validate::isValidSearch($alias))
+				$this->errors[] = $alias.' '.$this->l('is not a valid alias');
+
+		if (!count($this->errors))
+		{
+			foreach ($aliases as $alias)
+			{
+				$obj = new Alias(null, trim($alias), trim($search));
+				$obj->save();
+			}
+		}
+
+		if (empty($this->errors))
+			$this->confirmations[] = $this->l('Creation successfull');
+	}
 }
@@ -112,6 +112,8 @@ class AdminStoresControllerCore extends AdminController
 		);

 		parent::__construct();
+
+		$this->_buildOrderedFieldsShop($this->_getDefaultFieldsContent());
 	}

 	public function renderList()
@@ -386,6 +388,168 @@ class AdminStoresControllerCore extends AdminController
 		return $ret;
 	}

-}
+	protected function _getDefaultFieldsContent()
+	{
+		$this->context = Context::getContext();
+		$countryList = array();
+		$countryList[] = array('id' => '0', 'name' => $this->l('Choose your country'));
+		foreach (Country::getCountries($this->context->language->id) as $country)
+			$countryList[] = array('id' => $country['id_country'], 'name' => $country['name']);
+		$stateList = array();
+		$stateList[] = array('id' => '0', 'name' => $this->l('Choose your state (if applicable)'));
+		foreach (State::getStates($this->context->language->id) as $state)
+			$stateList[] = array('id' => $state['id_state'], 'name' => $state['name']);

+		$formFields = array(
+			'PS_SHOP_NAME' => array(
+				'title' => $this->l('Shop name:'),
+				'desc' => $this->l('Displayed in e-mails and page titles'),
+				'validation' => 'isGenericName',
+				'required' => true,
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_EMAIL' => array('title' => $this->l('Shop e-mail:'),
+				'desc' => $this->l('Displayed in e-mails sent to customers'),
+				'validation' => 'isEmail',
+				'required' => true,
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_DETAILS' => array(
+				'title' => $this->l('Registration:'),
+				'desc' => $this->l('Shop registration information (e.g., SIRET or RCS)'),
+				'validation' => 'isGenericName',
+				'size' => 30,
+				'type' => 'textarea',
+				'cols' => 30,
+				'rows' => 5
+			),
+			'PS_SHOP_ADDR1' => array(
+				'title' => $this->l('Shop address line 1:'),
+				'validation' => 'isAddress',
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_ADDR2' => array(
+				'title' => 'Address line 2',
+				'validation' => 'isAddress',
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_CODE' => array(
+				'title' => $this->l('Post/Zip code:'),
+				'validation' => 'isGenericName',
+				'size' => 6,
+				'type' => 'text'
+			),
+			'PS_SHOP_CITY' => array(
+				'title' => $this->l('City:'),
+				'validation' => 'isGenericName',
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_COUNTRY_ID' => array(
+				'title' => $this->l('Country:'),
+				'validation' => 'isInt',
+				'type' => 'select',
+				'list' => $countryList,
+				'identifier' => 'id',
+				'cast' => 'intval',
+				'defaultValue' => (int)$this->context->country->id
+			),
+			'PS_SHOP_STATE_ID' => array(
+				'title' => $this->l('State:'),
+				'validation' => 'isInt',
+				'type' => 'select',
+				'list' => $stateList,
+				'identifier' => 'id',
+				'cast' => 'intval'
+			),
+			'PS_SHOP_PHONE' => array(
+				'title' => $this->l('Phone:'),
+				'validation' => 'isGenericName',
+				'size' => 30,
+				'type' => 'text'
+			),
+			'PS_SHOP_FAX' => array(
+				'title' => $this->l('Fax:'),
+				'validation' => 'isGenericName',
+				'size' => 30,
+				'type' => 'text'
+			),
+		);
+		return $formFields;
+	}

+	protected function _buildOrderedFieldsShop($formFields)
+	{
+		$associatedOrderKey = array(
+			'PS_SHOP_NAME' => 'company',
+			'PS_SHOP_ADDR1' => 'address1',
+			'PS_SHOP_ADDR2' => 'address2',
+			'PS_SHOP_CITY' => 'city',
+			'PS_SHOP_STATE_ID' => 'State:name',
+			'PS_SHOP_CODE' => 'postcode',
+			'PS_SHOP_COUNTRY_ID' => 'Country:name',
+			'PS_SHOP_PHONE' => 'phone');
+
+		$fields = array();
+		$orderedFields = AddressFormat::getOrderedAddressFields(Configuration::get('PS_SHOP_COUNTRY_ID'), false, true);
+
+		foreach ($orderedFields as $lineFields)
+			if (($patterns = explode(' ', $lineFields)))
+				foreach ($patterns as $pattern)
+					if (($key = array_search($pattern, $associatedOrderKey)))
+						$fields[$key] = $formFields[$key];
+		foreach ($formFields as $key => $value)
+			if (!isset($fields[$key]))
+				$fields[$key] = $formFields[$key];
+
+		$this->options['contact'] = array(
+			'title' =>	$this->l('Contact details'),
+			'icon' =>	'tab-contact',
+			'fields' =>	$fields,
+			'submit' => array('title' => $this->l('   Save   '), 'class' => 'button')
+		);
+	}
+
+	public function beforeUpdateOptions()
+	{
+		if (isset($_POST['PS_SHOP_STATE_ID']) && $_POST['PS_SHOP_STATE_ID'] != '0')
+		{
+			$sql = 'SELECT `active` FROM `'._DB_PREFIX_.'state`
+					WHERE `id_country` = '.(int)Tools::getValue('PS_SHOP_COUNTRY_ID').'
+						AND `id_state` = '.(int)Tools::getValue('PS_SHOP_STATE_ID');
+			$isStateOk = Db::getInstance()->getValue($sql);
+			if ($isStateOk != 1)
+				$this->errors[] = Tools::displayError('This state is not in this country.');
+		}
+	}
+
+	public function updateOptionPsShopCountryId($value)
+	{
+		if (!$this->errors && $value)
+		{
+			$country = new Country($value, $this->context->language->id);
+			if ($country->id)
+			{
+				Configuration::updateValue('PS_SHOP_COUNTRY_ID', $value);
+				Configuration::updateValue('PS_SHOP_COUNTRY', pSQL($country->name));
+			}
+		}
+	}
+
+	public function updateOptionPsShopStateId($value)
+	{
+		if (!$this->errors && $value)
+		{
+			$state = new State($value);
+			if ($state->id)
+			{
+				Configuration::updateValue('PS_SHOP_STATE_ID', $value);
+				Configuration::updateValue('PS_SHOP_STATE', pSQL($state->name));
+			}
+		}
+	}
+}
@@ -9,104 +9,98 @@
    <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"/>
-    <access id="access_1_3" id_profile="SuperAdmin" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_4" id_profile="SuperAdmin" id_tab="Payment" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_5" id_profile="SuperAdmin" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_6" id_profile="SuperAdmin" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_7" id_profile="SuperAdmin" id_tab="Modules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_8" id_profile="SuperAdmin" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_9" id_profile="SuperAdmin" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_10" id_profile="SuperAdmin" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_11" id_profile="SuperAdmin" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_12" id_profile="SuperAdmin" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_13" id_profile="SuperAdmin" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_14" id_profile="SuperAdmin" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_15" id_profile="SuperAdmin" id_tab="Currencies" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_16" id_profile="SuperAdmin" id_tab="Taxes" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_17" id_profile="SuperAdmin" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_18" id_profile="SuperAdmin" id_tab="Countries" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_19" id_profile="SuperAdmin" id_tab="Zones" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_20" id_profile="SuperAdmin" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_21" id_profile="SuperAdmin" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_22" id_profile="SuperAdmin" id_tab="Positions" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_23" id_profile="SuperAdmin" id_tab="Database" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_24" id_profile="SuperAdmin" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_26" id_profile="SuperAdmin" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_27" id_profile="SuperAdmin" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_28" id_profile="SuperAdmin" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_29" id_profile="SuperAdmin" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_30" id_profile="SuperAdmin" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_31" id_profile="SuperAdmin" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_32" id_profile="SuperAdmin" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_33" id_profile="SuperAdmin" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_34" id_profile="SuperAdmin" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_35" id_profile="SuperAdmin" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_36" id_profile="SuperAdmin" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_37" id_profile="SuperAdmin" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_38" id_profile="SuperAdmin" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_39" id_profile="SuperAdmin" id_tab="Contact_Information" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_40" id_profile="SuperAdmin" id_tab="Keyword_Typos" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_41" id_profile="SuperAdmin" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_42" id_profile="SuperAdmin" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_43" id_profile="SuperAdmin" id_tab="Search" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_44" id_profile="SuperAdmin" id_tab="Localization" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_46" id_profile="SuperAdmin" id_tab="States" view="1" add="1" edit="1" delete="1"/>
-    <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_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"/>
-    <access id="access_1_55" id_profile="SuperAdmin" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_56" id_profile="SuperAdmin" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_57" id_profile="SuperAdmin" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_58" id_profile="SuperAdmin" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_60" id_profile="SuperAdmin" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_61" id_profile="SuperAdmin" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_62" id_profile="SuperAdmin" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_63" id_profile="SuperAdmin" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_64" id_profile="SuperAdmin" id_tab="Generators" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_65" id_profile="SuperAdmin" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_66" id_profile="SuperAdmin" id_tab="Tags" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_67" id_profile="SuperAdmin" id_tab="Search_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_68" id_profile="SuperAdmin" id_tab="Attachments" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_69" id_profile="SuperAdmin" id_tab="Configuration_Information" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_70" id_profile="SuperAdmin" id_tab="Performance" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_71" id_profile="SuperAdmin" id_tab="Customer_Service" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_72" id_profile="SuperAdmin" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_73" id_profile="SuperAdmin" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_80" id_profile="SuperAdmin" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_81" id_profile="SuperAdmin" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_82" id_profile="SuperAdmin" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_83" id_profile="SuperAdmin" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_84" id_profile="SuperAdmin" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_85" id_profile="SuperAdmin" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_86" id_profile="SuperAdmin" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_87" id_profile="SuperAdmin" id_tab="Home" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_88" id_profile="SuperAdmin" id_tab="Shops" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_89" id_profile="SuperAdmin" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_90" id_profile="SuperAdmin" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_91" id_profile="SuperAdmin" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_92" id_profile="SuperAdmin" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_93" id_profile="SuperAdmin" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_94" id_profile="SuperAdmin" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_95" id_profile="SuperAdmin" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_96" id_profile="SuperAdmin" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
-    <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="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"/>
-    <access id="access_1_110" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_1" id_profile="SuperAdmin" id_tab="Home" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_2" id_profile="SuperAdmin" id_tab="tab_2" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_3" id_profile="SuperAdmin" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_4" id_profile="SuperAdmin" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_5" id_profile="SuperAdmin" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_6" id_profile="SuperAdmin" id_tab="Search" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_7" id_profile="SuperAdmin" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_8" id_profile="SuperAdmin" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_9" id_profile="SuperAdmin" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_11" id_profile="SuperAdmin" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_12" id_profile="SuperAdmin" id_tab="Localization" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_13" id_profile="SuperAdmin" id_tab="Modules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_14" id_profile="SuperAdmin" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_15" id_profile="SuperAdmin" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_17" id_profile="SuperAdmin" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_18" id_profile="SuperAdmin" id_tab="Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_19" id_profile="SuperAdmin" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_20" id_profile="SuperAdmin" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_21" id_profile="SuperAdmin" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_22" id_profile="SuperAdmin" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_23" id_profile="SuperAdmin" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_24" id_profile="SuperAdmin" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_25" id_profile="SuperAdmin" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_26" id_profile="SuperAdmin" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_27" id_profile="SuperAdmin" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_28" id_profile="SuperAdmin" id_tab="Tags" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_29" id_profile="SuperAdmin" id_tab="Attachments" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_31" id_profile="SuperAdmin" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_32" id_profile="SuperAdmin" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_33" id_profile="SuperAdmin" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_34" id_profile="SuperAdmin" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_35" id_profile="SuperAdmin" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_36" id_profile="SuperAdmin" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_38" id_profile="SuperAdmin" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_39" id_profile="SuperAdmin" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_40" id_profile="SuperAdmin" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_41" id_profile="SuperAdmin" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_42" id_profile="SuperAdmin" id_tab="Customer_Service" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_43" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_44" id_profile="SuperAdmin" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_45" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_46" id_profile="SuperAdmin" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_47" id_profile="SuperAdmin" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_48" id_profile="SuperAdmin" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_51" id_profile="SuperAdmin" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_52" id_profile="SuperAdmin" id_tab="Zones" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_53" id_profile="SuperAdmin" id_tab="Countries" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_54" id_profile="SuperAdmin" id_tab="States" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_55" id_profile="SuperAdmin" id_tab="Currencies" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_56" id_profile="SuperAdmin" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_57" id_profile="SuperAdmin" id_tab="Taxes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_58" id_profile="SuperAdmin" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_60" id_profile="SuperAdmin" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_61" id_profile="SuperAdmin" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_62" id_profile="SuperAdmin" id_tab="Positions" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_64" id_profile="SuperAdmin" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_65" id_profile="SuperAdmin" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_66" id_profile="SuperAdmin" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_67" id_profile="SuperAdmin" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_68" id_profile="SuperAdmin" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_70" id_profile="SuperAdmin" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_71" id_profile="SuperAdmin" id_tab="Contact_stores" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_72" id_profile="SuperAdmin" id_tab="Search_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_73" id_profile="SuperAdmin" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_74" id_profile="SuperAdmin" id_tab="Payment" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_75" id_profile="SuperAdmin" id_tab="Maintenance" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_77" id_profile="SuperAdmin" id_tab="Configuration_Information" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_78" id_profile="SuperAdmin" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_79" id_profile="SuperAdmin" id_tab="Subdomains" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_80" id_profile="SuperAdmin" id_tab="DB_Backup" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_81" id_profile="SuperAdmin" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_82" id_profile="SuperAdmin" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_83" id_profile="SuperAdmin" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_84" id_profile="SuperAdmin" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_85" id_profile="SuperAdmin" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_86" id_profile="SuperAdmin" id_tab="Performance" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_88" id_profile="SuperAdmin" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_89" id_profile="SuperAdmin" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_90" id_profile="SuperAdmin" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_91" id_profile="SuperAdmin" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_92" id_profile="SuperAdmin" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_94" id_profile="SuperAdmin" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_95" id_profile="SuperAdmin" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_98" id_profile="SuperAdmin" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_99" id_profile="SuperAdmin" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_100" id_profile="SuperAdmin" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_101" id_profile="SuperAdmin" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_102" id_profile="SuperAdmin" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_103" id_profile="SuperAdmin" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_104" id_profile="SuperAdmin" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_105" id_profile="SuperAdmin" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_106" id_profile="SuperAdmin" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_107" id_profile="SuperAdmin" id_tab="Customers_2" view="1" add="1" edit="1" delete="1"/>
  </entities>
 </entity_access>
@@ -27,42 +27,42 @@
    <tab id="Catalog" id_parent="" active="1">
      <class_name>AdminCatalog</class_name>
    </tab>
-    <tab id="Customers" id_parent="" active="1">
-      <class_name>AdminCustomers</class_name>
-    </tab>
    <tab id="Orders" id_parent="" active="1">
-      <class_name>AdminOrders</class_name>
+      <class_name>AdminParentOrders</class_name>
    </tab>
-    <tab id="Payment" id_parent="" active="1">
-      <class_name>AdminPayment</class_name>
+    <tab id="Customers" id_parent="" active="1">
+      <class_name>AdminParentCustomer</class_name>
+    </tab>
+    <tab id="Price_rules" id_parent="" active="1">
+      <class_name>AdminPriceRule</class_name>
    </tab>
    <tab id="Shipping" id_parent="" active="1">
-      <class_name>AdminShipping</class_name>
+      <class_name>AdminParentShipping</class_name>
    </tab>
-    <tab id="Stats" id_parent="" active="1">
-      <class_name>AdminStats</class_name>
+    <tab id="Localization" id_parent="" active="1">
+      <class_name>AdminParentLocalization</class_name>
    </tab>
    <tab id="Modules" id_parent="" active="1">
-      <class_name>AdminModules</class_name>
-    </tab>
-    <tab id="Employees" id_parent="" active="1">
-      <class_name>AdminEmployees</class_name>
+      <class_name>AdminParentModules</class_name>
    </tab>
    <tab id="Preferences" id_parent="" active="1">
-      <class_name>AdminPreferences</class_name>
+      <class_name>AdminParentPreferences</class_name>
    </tab>
    <tab id="Tools" id_parent="" active="1">
      <class_name>AdminTools</class_name>
    </tab>
+    <tab id="tab_16" id_parent="" active="1">
+      <class_name>AdminAdmin</class_name>
+    </tab>
+    <tab id="Stats" id_parent="" active="1">
+      <class_name>AdminParentStats</class_name>
+    </tab>
    <tab id="Shops" id_parent="" active="1">
-      <class_name>AdminShop</class_name>
+      <class_name>AdminParentShop</class_name>
    </tab>
    <tab id="Stock" id_parent="" active="1">
      <class_name>AdminStock</class_name>
    </tab>
-    <tab id="Accounting" id_parent="" active="1">
-      <class_name>AdminAccounting</class_name>
-    </tab>
    <tab id="Products" id_parent="Catalog" active="1">
      <class_name>AdminProducts</class_name>
    </tab>
@@ -72,18 +72,18 @@
    <tab id="Monitoring" id_parent="Catalog" active="1">
      <class_name>AdminTracking</class_name>
    </tab>
-    <tab id="Manufacturers" id_parent="Catalog" active="1">
-      <class_name>AdminManufacturers</class_name>
-    </tab>
-    <tab id="Suppliers" id_parent="Catalog" active="1">
-      <class_name>AdminSuppliers</class_name>
-    </tab>
    <tab id="Attributes_and_Values" id_parent="Catalog" active="1">
      <class_name>AdminAttributesGroups</class_name>
    </tab>
    <tab id="Features" id_parent="Catalog" active="1">
      <class_name>AdminFeatures</class_name>
    </tab>
+    <tab id="Manufacturers" id_parent="Catalog" active="1">
+      <class_name>AdminManufacturers</class_name>
+    </tab>
+    <tab id="Suppliers" id_parent="Catalog" active="1">
+      <class_name>AdminSuppliers</class_name>
+    </tab>
    <tab id="Image_Mapping" id_parent="Catalog" active="1">
      <class_name>AdminScenes</class_name>
    </tab>
@@ -93,33 +93,18 @@
    <tab id="Attachments" id_parent="Catalog" active="1">
      <class_name>AdminAttachments</class_name>
    </tab>
-    <tab id="Catalog_price_rules" id_parent="Catalog" active="1">
-      <class_name>AdminSpecificPriceRule</class_name>
-    </tab>
-    <tab id="Addresses" id_parent="Customers" active="1">
-      <class_name>AdminAddresses</class_name>
-    </tab>
-    <tab id="Groups" id_parent="Customers" active="1">
-      <class_name>AdminGroups</class_name>
-    </tab>
-    <tab id="Shopping_Carts" id_parent="Customers" active="1">
-      <class_name>AdminCarts</class_name>
-    </tab>
-    <tab id="Genders" id_parent="Customers" active="1">
-      <class_name>AdminGenders</class_name>
-    </tab>
-    <tab id="Outstanding" id_parent="Customers" active="0">
-      <class_name>AdminOutstanding</class_name>
+    <tab id="Orders_1" id_parent="Orders" active="1">
+      <class_name>AdminOrders</class_name>
    </tab>
    <tab id="Invoices" id_parent="Orders" active="1">
      <class_name>AdminInvoices</class_name>
    </tab>
-    <tab id="Delivery_Slips" id_parent="Orders" active="1">
-      <class_name>AdminDeliverySlip</class_name>
-    </tab>
    <tab id="Merchandise_Returns" id_parent="Orders" active="1">
      <class_name>AdminReturn</class_name>
    </tab>
+    <tab id="Delivery_Slips" id_parent="Orders" active="1">
+      <class_name>AdminDeliverySlip</class_name>
+    </tab>
    <tab id="Credit_Slips" id_parent="Orders" active="1">
      <class_name>AdminSlip</class_name>
    </tab>
@@ -129,41 +114,77 @@
    <tab id="Order_Messages" id_parent="Orders" active="1">
      <class_name>AdminOrderMessage</class_name>
    </tab>
-    <tab id="Currencies" id_parent="Payment" active="1">
-      <class_name>AdminCurrencies</class_name>
+    <tab id="Customers_1" id_parent="Customers" active="1">
+      <class_name>AdminCustomers</class_name>
    </tab>
-    <tab id="Taxes" id_parent="Payment" active="1">
-      <class_name>AdminTaxes</class_name>
+    <tab id="Addresses" id_parent="Customers" active="1">
+      <class_name>AdminAddresses</class_name>
    </tab>
-    <tab id="Tax_Rules" id_parent="Payment" active="1">
-      <class_name>AdminTaxRulesGroup</class_name>
+    <tab id="Groups" id_parent="Customers" active="1">
+      <class_name>AdminGroups</class_name>
    </tab>
-    <tab id="Cart_Rules" id_parent="Payment" active="1">
+    <tab id="Shopping_Carts" id_parent="Customers" active="1">
+      <class_name>AdminCarts</class_name>
+    </tab>
+    <tab id="Customer_Service" id_parent="Customers" active="1">
+      <class_name>AdminCustomerThreads</class_name>
+    </tab>
+    <tab id="Contacts" id_parent="Customers" active="1">
+      <class_name>AdminContacts</class_name>
+    </tab>
+    <tab id="Genders" id_parent="Customers" active="1">
+      <class_name>AdminGenders</class_name>
+    </tab>
+    <tab id="Outstanding" id_parent="Customers" active="0">
+      <class_name>AdminOutstanding</class_name>
+    </tab>
+    <tab id="Cart_Rules" id_parent="Price_rules" active="1">
      <class_name>AdminCartRules</class_name>
    </tab>
+    <tab id="Catalog_price_rules" id_parent="Price_rules" active="1">
+      <class_name>AdminSpecificPriceRule</class_name>
+    </tab>
+    <tab id="Shipping_1" id_parent="Shipping" active="1">
+      <class_name>AdminShipping</class_name>
+    </tab>
    <tab id="Carriers" id_parent="Shipping" active="1">
      <class_name>AdminCarriers</class_name>
    </tab>
-    <tab id="States" id_parent="Shipping" active="1">
-      <class_name>AdminStates</class_name>
-    </tab>
-    <tab id="Countries" id_parent="Shipping" active="1">
-      <class_name>AdminCountries</class_name>
-    </tab>
-    <tab id="Zones" id_parent="Shipping" active="1">
-      <class_name>AdminZones</class_name>
-    </tab>
    <tab id="Price_Ranges" id_parent="Shipping" active="1">
      <class_name>AdminRangePrice</class_name>
    </tab>
    <tab id="Weight_Ranges" id_parent="Shipping" active="1">
      <class_name>AdminRangeWeight</class_name>
    </tab>
-    <tab id="Search_Engines" id_parent="Stats" active="1">
-      <class_name>AdminSearchEngines</class_name>
+    <tab id="Localization_1" id_parent="Localization" active="1">
+      <class_name>AdminLocalization</class_name>
    </tab>
-    <tab id="Referrers" id_parent="Stats" active="1">
-      <class_name>AdminReferrers</class_name>
+    <tab id="Languages" id_parent="Localization" active="1">
+      <class_name>AdminLanguages</class_name>
+    </tab>
+    <tab id="Zones" id_parent="Localization" active="1">
+      <class_name>AdminZones</class_name>
+    </tab>
+    <tab id="Countries" id_parent="Localization" active="1">
+      <class_name>AdminCountries</class_name>
+    </tab>
+    <tab id="States" id_parent="Localization" active="1">
+      <class_name>AdminStates</class_name>
+    </tab>
+    <tab id="Currencies" id_parent="Localization" active="1">
+      <class_name>AdminCurrencies</class_name>
+    </tab>
+    <tab id="Tax_Rules" id_parent="Localization" active="1">
+      <class_name>AdminTaxRulesGroup</class_name>
+    </tab>
+    <tab id="Taxes" id_parent="Localization" active="1">
+      <class_name>AdminTaxes</class_name>
+    </tab>
+    <tab id="Translations" id_parent="Localization" active="1">
+      <class_name>AdminTranslations</class_name>
+    </tab>
+    <tab id="Modules_1" id_parent="Modules" active="1">
+      <class_name>AdminModules</class_name>
    </tab>
    <tab id="Modules_Themes_Catalog" id_parent="Modules" active="1">
      <class_name>AdminAddonsCatalog</class_name>
@@ -171,101 +192,110 @@
    <tab id="My_Account" id_parent="Modules" active="1">
      <class_name>AdminAddonsMyAccount</class_name>
    </tab>
-    <tab id="Themes" id_parent="Modules" active="1">
-      <class_name>AdminThemes</class_name>
-    </tab>
    <tab id="Positions" id_parent="Modules" active="1">
      <class_name>AdminModulesPositions</class_name>
    </tab>
-    <tab id="Profiles" id_parent="Employees" active="1">
-      <class_name>AdminProfiles</class_name>
+    <tab id="Payment" id_parent="Modules" active="1">
+      <class_name>AdminPayment</class_name>
    </tab>
-    <tab id="Permissions" id_parent="Employees" active="1">
-      <class_name>AdminAccess</class_name>
+    <tab id="General" id_parent="Preferences" active="1">
+      <class_name>AdminPreferences</class_name>
    </tab>
-    <tab id="Contacts" id_parent="Employees" active="1">
-      <class_name>AdminContacts</class_name>
+    <tab id="Orders_2" id_parent="Preferences" active="1">
+      <class_name>AdminOrderPreferences</class_name>
    </tab>
-    <tab id="Tabs" id_parent="Employees" active="1">
-      <class_name>AdminTabs</class_name>
+    <tab id="Products_1" id_parent="Preferences" active="1">
+      <class_name>AdminPPreferences</class_name>
    </tab>
-    <tab id="Customer_Service" id_parent="Employees" active="1">
-      <class_name>AdminCustomerThreads</class_name>
+    <tab id="Customers_2" id_parent="Preferences" active="1">
+      <class_name>AdminCustomerPreferences</class_name>
    </tab>
-    <tab id="Contact_Information" id_parent="Preferences" active="1">
-      <class_name>AdminContact</class_name>
-    </tab>
-    <tab id="Themes_1" id_parent="Preferences" active="1">
+    <tab id="Themes" id_parent="Preferences" active="1">
      <class_name>AdminThemes</class_name>
    </tab>
    <tab id="SEO_URLs" id_parent="Preferences" active="1">
      <class_name>AdminMeta</class_name>
    </tab>
-    <tab id="Products_1" id_parent="Preferences" active="1">
-      <class_name>AdminPPreferences</class_name>
-    </tab>
-    <tab id="Keyword_Typos" id_parent="Preferences" active="1">
-      <class_name>AdminAliases</class_name>
-    </tab>
-    <tab id="E-mail" id_parent="Preferences" active="1">
-      <class_name>AdminEmails</class_name>
+    <tab id="CMS" id_parent="Preferences" active="1">
+      <class_name>AdminCmsContent</class_name>
    </tab>
    <tab id="Images" id_parent="Preferences" active="1">
      <class_name>AdminImages</class_name>
    </tab>
-    <tab id="Database" id_parent="Preferences" active="1">
-      <class_name>AdminDb</class_name>
-    </tab>
-    <tab id="Localization" id_parent="Preferences" active="1">
-      <class_name>AdminLocalization</class_name>
+    <tab id="Contact_stores" id_parent="Preferences" active="1">
+      <class_name>AdminStores</class_name>
    </tab>
    <tab id="Search_1" id_parent="Preferences" active="1">
      <class_name>AdminSearchConf</class_name>
    </tab>
-    <tab id="Performance" id_parent="Preferences" active="1">
-      <class_name>AdminPerformance</class_name>
+    <tab id="Maintenance" id_parent="Preferences" active="1">
+      <class_name>AdminMaintenance</class_name>
    </tab>
    <tab id="Geolocation" id_parent="Preferences" active="1">
      <class_name>AdminGeolocation</class_name>
    </tab>
-    <tab id="Languages" id_parent="Tools" active="1">
-      <class_name>AdminLanguages</class_name>
-    </tab>
-    <tab id="Translations" id_parent="Tools" active="1">
-      <class_name>AdminTranslations</class_name>
-    </tab>
-    <tab id="Quick_Access" id_parent="Tools" active="1">
-      <class_name>AdminQuickAccesses</class_name>
-    </tab>
    <tab id="Configuration_Information" id_parent="Tools" active="1">
      <class_name>AdminInformation</class_name>
    </tab>
+    <tab id="Performance" id_parent="Tools" active="1">
+      <class_name>AdminPerformance</class_name>
+    </tab>
+    <tab id="E-mail" id_parent="Tools" active="1">
+      <class_name>AdminEmails</class_name>
+    </tab>
    <tab id="CSV_Import" id_parent="Tools" active="1">
      <class_name>AdminImport</class_name>
    </tab>
-    <tab id="Subdomains" id_parent="Tools" active="1">
-      <class_name>AdminSubDomains</class_name>
-    </tab>
    <tab id="DB_Backup" id_parent="Tools" active="1">
      <class_name>AdminBackup</class_name>
    </tab>
-    <tab id="CMS" id_parent="Tools" active="1">
-      <class_name>AdminCmsContent</class_name>
+    <tab id="SQL_Manager" id_parent="Tools" active="1">
+      <class_name>AdminRequestSql</class_name>
    </tab>
-    <tab id="Generators" id_parent="Tools" active="1">
-      <class_name>AdminGenerator</class_name>
-    </tab>
-    <tab id="Stores" id_parent="Tools" active="1">
-      <class_name>AdminStores</class_name>
-    </tab>
-    <tab id="Webservice" id_parent="Tools" active="1">
-      <class_name>AdminWebservice</class_name>
+    <tab id="Accounting" id_parent="Tools" active="1">
+      <class_name>AdminAccountingManagement</class_name>
    </tab>
    <tab id="Logs" id_parent="Tools" active="1">
      <class_name>AdminLogs</class_name>
    </tab>
-    <tab id="SQL_Manager" id_parent="Tools" active="1">
-      <class_name>AdminRequestSql</class_name>
+    <tab id="Subdomains" id_parent="Tools" active="1">
+      <class_name>AdminSubDomains</class_name>
+    </tab>
+    <tab id="Webservice" id_parent="Tools" active="1">
+      <class_name>AdminWebservice</class_name>
+    </tab>
+    <tab id="Preferences_1" id_parent="tab_16" active="1">
+      <class_name>AdminAdminPreferences</class_name>
+    </tab>
+    <tab id="Quick_Access" id_parent="tab_16" active="1">
+      <class_name>AdminQuickAccesses</class_name>
+    </tab>
+    <tab id="Employees" id_parent="tab_16" active="1">
+      <class_name>AdminEmployees</class_name>
+    </tab>
+    <tab id="Profiles" id_parent="tab_16" active="1">
+      <class_name>AdminProfiles</class_name>
+    </tab>
+    <tab id="Permissions" id_parent="tab_16" active="1">
+      <class_name>AdminAccess</class_name>
+    </tab>
+    <tab id="Tabs" id_parent="tab_16" active="1">
+      <class_name>AdminTabs</class_name>
+    </tab>
+    <tab id="Stats_1" id_parent="Stats" active="1">
+      <class_name>AdminStats</class_name>
+    </tab>
+    <tab id="Search_Engines" id_parent="Stats" active="1">
+      <class_name>AdminSearchEngines</class_name>
+    </tab>
+    <tab id="Referrers" id_parent="Stats" active="1">
+      <class_name>AdminReferrers</class_name>
+    </tab>
+    <tab id="Accounting_export" id_parent="Stats" active="1">
+      <class_name>AdminAccountingExport</class_name>
+    </tab>
+    <tab id="Shops_1" id_parent="Shops" active="1">
+      <class_name>AdminShop</class_name>
    </tab>
    <tab id="Group_Shops" id_parent="Shops" active="1">
      <class_name>AdminGroupShop</class_name>
@@ -294,14 +324,5 @@
    <tab id="Configuration" id_parent="Stock" active="1">
      <class_name>AdminStockConfiguration</class_name>
    </tab>
-    <tab id="Account_Number_Management" id_parent="Accounting" active="1">
-      <class_name>AdminAccountingManagement</class_name>
-    </tab>
-    <tab id="Export" id_parent="Accounting" active="1">
-      <class_name>AdminAccountingExport</class_name>
-    </tab>
-    <tab id="Display_Accounting_Plan" id_parent="Accounting" active="1">
-      <class_name>AdminAccountingRegisteredNumber</class_name>
-    </tab>
  </entities>
 </entity_tab>
@@ -9,397 +9,429 @@
    <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"/>
-    <access id="access_2_3" id_profile="Administrator" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_4" id_profile="Administrator" id_tab="Payment" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_5" id_profile="Administrator" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_6" id_profile="Administrator" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_7" id_profile="Administrator" id_tab="Modules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_8" id_profile="Administrator" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_9" id_profile="Administrator" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_10" id_profile="Administrator" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_11" id_profile="Administrator" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_12" id_profile="Administrator" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_13" id_profile="Administrator" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_14" id_profile="Administrator" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_15" id_profile="Administrator" id_tab="Currencies" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_16" id_profile="Administrator" id_tab="Taxes" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_17" id_profile="Administrator" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_18" id_profile="Administrator" id_tab="Countries" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_19" id_profile="Administrator" id_tab="Zones" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_20" id_profile="Administrator" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_21" id_profile="Administrator" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_22" id_profile="Administrator" id_tab="Positions" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_23" id_profile="Administrator" id_tab="Database" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_24" id_profile="Administrator" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_26" id_profile="Administrator" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_27" id_profile="Administrator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_28" id_profile="Administrator" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_29" id_profile="Administrator" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_30" id_profile="Administrator" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_31" id_profile="Administrator" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_32" id_profile="Administrator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_33" id_profile="Administrator" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_34" id_profile="Administrator" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_35" id_profile="Administrator" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_36" id_profile="Administrator" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_37" id_profile="Administrator" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_38" id_profile="Administrator" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_39" id_profile="Administrator" id_tab="Contact_Information" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_40" id_profile="Administrator" id_tab="Keyword_Typos" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_41" id_profile="Administrator" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_42" id_profile="Administrator" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_43" id_profile="Administrator" id_tab="Search" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_44" id_profile="Administrator" id_tab="Localization" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_46" id_profile="Administrator" id_tab="States" view="1" add="1" edit="1" delete="1"/>
-    <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_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"/>
-    <access id="access_2_55" id_profile="Administrator" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_56" id_profile="Administrator" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_57" id_profile="Administrator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_58" id_profile="Administrator" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_60" id_profile="Administrator" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_61" id_profile="Administrator" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_62" id_profile="Administrator" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_63" id_profile="Administrator" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_64" id_profile="Administrator" id_tab="Generators" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_65" id_profile="Administrator" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_66" id_profile="Administrator" id_tab="Tags" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_67" id_profile="Administrator" id_tab="Search_1" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_68" id_profile="Administrator" id_tab="Attachments" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_69" id_profile="Administrator" id_tab="Configuration_Information" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_70" id_profile="Administrator" id_tab="Performance" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_71" id_profile="Administrator" id_tab="Customer_Service" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_72" id_profile="Administrator" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_73" id_profile="Administrator" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_80" id_profile="Administrator" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_81" id_profile="Administrator" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_82" id_profile="Administrator" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_83" id_profile="Administrator" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_84" id_profile="Administrator" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_85" id_profile="Administrator" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_86" id_profile="Administrator" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_87" id_profile="Administrator" id_tab="Home" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_88" id_profile="Administrator" id_tab="Shops" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_89" id_profile="Administrator" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_90" id_profile="Administrator" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_91" id_profile="Administrator" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_92" id_profile="Administrator" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_93" id_profile="Administrator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_94" id_profile="Administrator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_95" id_profile="Administrator" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_96" id_profile="Administrator" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
-    <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="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_2_110" id_profile="Administrator" id_tab="Outstanding" 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"/>
-    <access id="access_3_4" id_profile="Logistician" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_5" id_profile="Logistician" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_6" id_profile="Logistician" id_tab="Stats" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_7" id_profile="Logistician" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_8" id_profile="Logistician" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_9" id_profile="Logistician" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_10" id_profile="Logistician" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_11" id_profile="Logistician" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_12" id_profile="Logistician" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_13" id_profile="Logistician" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_14" id_profile="Logistician" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_15" id_profile="Logistician" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_16" id_profile="Logistician" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_17" id_profile="Logistician" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_18" id_profile="Logistician" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_19" id_profile="Logistician" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_20" id_profile="Logistician" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_21" id_profile="Logistician" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_22" id_profile="Logistician" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_23" id_profile="Logistician" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_24" id_profile="Logistician" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_26" id_profile="Logistician" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_27" id_profile="Logistician" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_28" id_profile="Logistician" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_29" id_profile="Logistician" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_30" id_profile="Logistician" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_31" id_profile="Logistician" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_32" id_profile="Logistician" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_33" id_profile="Logistician" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_34" id_profile="Logistician" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_35" id_profile="Logistician" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_36" id_profile="Logistician" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_37" id_profile="Logistician" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_38" id_profile="Logistician" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_39" id_profile="Logistician" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_40" id_profile="Logistician" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_41" id_profile="Logistician" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_42" id_profile="Logistician" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_43" id_profile="Logistician" id_tab="Search" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_44" id_profile="Logistician" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_46" id_profile="Logistician" id_tab="States" view="0" add="0" edit="0" delete="0"/>
-    <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="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"/>
-    <access id="access_3_55" id_profile="Logistician" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_56" id_profile="Logistician" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_57" id_profile="Logistician" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_58" id_profile="Logistician" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_59" id_profile="Logistician" id_tab="59" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_60" id_profile="Logistician" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_61" id_profile="Logistician" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_62" id_profile="Logistician" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_63" id_profile="Logistician" id_tab="Groups" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_64" id_profile="Logistician" id_tab="Generators" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_65" id_profile="Logistician" id_tab="Shopping_Carts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_66" id_profile="Logistician" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_67" id_profile="Logistician" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_68" id_profile="Logistician" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_69" id_profile="Logistician" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_70" id_profile="Logistician" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_71" id_profile="Logistician" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_72" id_profile="Logistician" id_tab="Webservice" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_73" id_profile="Logistician" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_80" id_profile="Logistician" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_81" id_profile="Logistician" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_82" id_profile="Logistician" id_tab="Stores" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_83" id_profile="Logistician" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_84" id_profile="Logistician" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_85" id_profile="Logistician" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
-    <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_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" 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="Stock" 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"/>
-    <access id="access_4_4" id_profile="Translator" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_5" id_profile="Translator" id_tab="Shipping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_6" id_profile="Translator" id_tab="Stats" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_7" id_profile="Translator" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_8" id_profile="Translator" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_9" id_profile="Translator" id_tab="Tools" view="1" add="0" edit="0" delete="0"/>
-    <access id="access_4_10" id_profile="Translator" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_11" id_profile="Translator" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_12" id_profile="Translator" id_tab="Addresses" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_13" id_profile="Translator" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_14" id_profile="Translator" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_15" id_profile="Translator" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_16" id_profile="Translator" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_17" id_profile="Translator" id_tab="Carriers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_18" id_profile="Translator" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_19" id_profile="Translator" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_20" id_profile="Translator" id_tab="Price_Ranges" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_21" id_profile="Translator" id_tab="Weight_Ranges" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_22" id_profile="Translator" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_23" id_profile="Translator" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_24" id_profile="Translator" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_26" id_profile="Translator" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_27" id_profile="Translator" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_28" id_profile="Translator" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_29" id_profile="Translator" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_30" id_profile="Translator" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_31" id_profile="Translator" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_32" id_profile="Translator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_4_33" id_profile="Translator" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_4_34" id_profile="Translator" id_tab="Suppliers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_35" id_profile="Translator" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_36" id_profile="Translator" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_37" id_profile="Translator" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_38" id_profile="Translator" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_39" id_profile="Translator" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_40" id_profile="Translator" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_41" id_profile="Translator" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_42" id_profile="Translator" id_tab="Invoices" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_43" id_profile="Translator" id_tab="Search" view="1" add="0" edit="0" delete="0"/>
-    <access id="access_4_44" id_profile="Translator" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_46" id_profile="Translator" id_tab="States" view="0" add="0" edit="0" delete="0"/>
-    <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="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"/>
-    <access id="access_4_55" id_profile="Translator" id_tab="Delivery_Slips" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_56" id_profile="Translator" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_57" id_profile="Translator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_4_58" id_profile="Translator" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_59" id_profile="Translator" id_tab="59" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_60" id_profile="Translator" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_61" id_profile="Translator" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_62" id_profile="Translator" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_63" id_profile="Translator" id_tab="Groups" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_64" id_profile="Translator" id_tab="Generators" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_65" id_profile="Translator" id_tab="Shopping_Carts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_66" id_profile="Translator" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_67" id_profile="Translator" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_68" id_profile="Translator" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_69" id_profile="Translator" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_70" id_profile="Translator" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_71" id_profile="Translator" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_72" id_profile="Translator" id_tab="Webservice" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_73" id_profile="Translator" id_tab="Stock_Movement" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_80" id_profile="Translator" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_81" id_profile="Translator" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_82" id_profile="Translator" id_tab="Stores" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_83" id_profile="Translator" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_84" id_profile="Translator" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_85" id_profile="Translator" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_86" id_profile="Translator" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_87" id_profile="Translator" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_88" id_profile="Translator" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_89" id_profile="Translator" id_tab="Group_Shops" view="0" add="0" edit="0" delete="0"/>
-    <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" 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="Stock" 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"/>
-    <access id="access_5_4" id_profile="Salesman" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_5" id_profile="Salesman" id_tab="Shipping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_6" id_profile="Salesman" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_7" id_profile="Salesman" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_8" id_profile="Salesman" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_9" id_profile="Salesman" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_10" id_profile="Salesman" id_tab="Manufacturers" view="1" add="0" edit="0" delete="0"/>
-    <access id="access_5_11" id_profile="Salesman" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_12" id_profile="Salesman" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_13" id_profile="Salesman" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_14" id_profile="Salesman" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_15" id_profile="Salesman" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_16" id_profile="Salesman" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_17" id_profile="Salesman" id_tab="Carriers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_18" id_profile="Salesman" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_19" id_profile="Salesman" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_20" id_profile="Salesman" id_tab="Price_Ranges" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_21" id_profile="Salesman" id_tab="Weight_Ranges" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_22" id_profile="Salesman" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_23" id_profile="Salesman" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_24" id_profile="Salesman" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_26" id_profile="Salesman" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_27" id_profile="Salesman" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_28" id_profile="Salesman" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_29" id_profile="Salesman" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_30" id_profile="Salesman" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_31" id_profile="Salesman" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_32" id_profile="Salesman" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_33" id_profile="Salesman" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_34" id_profile="Salesman" id_tab="Suppliers" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_35" id_profile="Salesman" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_36" id_profile="Salesman" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_37" id_profile="Salesman" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_38" id_profile="Salesman" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_39" id_profile="Salesman" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_40" id_profile="Salesman" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_41" id_profile="Salesman" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_42" id_profile="Salesman" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_43" id_profile="Salesman" id_tab="Search" view="1" add="0" edit="0" delete="0"/>
-    <access id="access_5_44" id_profile="Salesman" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_46" id_profile="Salesman" id_tab="States" view="0" add="0" edit="0" delete="0"/>
-    <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="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"/>
-    <access id="access_5_55" id_profile="Salesman" id_tab="Delivery_Slips" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_56" id_profile="Salesman" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_57" id_profile="Salesman" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_58" id_profile="Salesman" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_59" id_profile="Salesman" id_tab="59" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_60" id_profile="Salesman" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_61" id_profile="Salesman" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_62" id_profile="Salesman" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_63" id_profile="Salesman" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_64" id_profile="Salesman" id_tab="Generators" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_65" id_profile="Salesman" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_66" id_profile="Salesman" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_67" id_profile="Salesman" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_68" id_profile="Salesman" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_69" id_profile="Salesman" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_70" id_profile="Salesman" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_71" id_profile="Salesman" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_72" id_profile="Salesman" id_tab="Webservice" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_73" id_profile="Salesman" id_tab="Stock_Movement" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_80" id_profile="Salesman" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_81" id_profile="Salesman" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_82" id_profile="Salesman" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_83" id_profile="Salesman" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_84" id_profile="Salesman" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_85" id_profile="Salesman" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_86" id_profile="Salesman" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_87" id_profile="Salesman" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_88" id_profile="Salesman" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_89" id_profile="Salesman" id_tab="Group_Shops" view="0" add="0" edit="0" delete="0"/>
-    <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_93" id_profile="Salesman" id_tab="Products" 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="Stock" 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"/>
+    <access id="access_2_1" id_profile="Administrator" id_tab="Home" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_2" id_profile="Administrator" id_tab="tab_2" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_3" id_profile="Administrator" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_4" id_profile="Administrator" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_5" id_profile="Administrator" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_6" id_profile="Administrator" id_tab="Search" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_7" id_profile="Administrator" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_8" id_profile="Administrator" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_9" id_profile="Administrator" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_10" id_profile="Administrator" id_tab="Price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_11" id_profile="Administrator" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_12" id_profile="Administrator" id_tab="Localization" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_13" id_profile="Administrator" id_tab="Modules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_14" id_profile="Administrator" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_15" id_profile="Administrator" id_tab="Tools" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_16" id_profile="Administrator" id_tab="tab_16" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_17" id_profile="Administrator" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_18" id_profile="Administrator" id_tab="Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_19" id_profile="Administrator" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_20" id_profile="Administrator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_21" id_profile="Administrator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_22" id_profile="Administrator" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_23" id_profile="Administrator" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_24" id_profile="Administrator" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_25" id_profile="Administrator" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_26" id_profile="Administrator" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_27" id_profile="Administrator" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_28" id_profile="Administrator" id_tab="Tags" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_29" id_profile="Administrator" id_tab="Attachments" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_30" id_profile="Administrator" id_tab="Orders_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_31" id_profile="Administrator" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_32" id_profile="Administrator" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_33" id_profile="Administrator" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_34" id_profile="Administrator" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_35" id_profile="Administrator" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_36" id_profile="Administrator" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_37" id_profile="Administrator" id_tab="Customers_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_38" id_profile="Administrator" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_39" id_profile="Administrator" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_40" id_profile="Administrator" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_41" id_profile="Administrator" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_42" id_profile="Administrator" id_tab="Customer_Service" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_43" id_profile="Administrator" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_44" id_profile="Administrator" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_45" id_profile="Administrator" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_46" id_profile="Administrator" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_47" id_profile="Administrator" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_48" id_profile="Administrator" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_49" id_profile="Administrator" id_tab="Shipping_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_50" id_profile="Administrator" id_tab="Localization_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_51" id_profile="Administrator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_52" id_profile="Administrator" id_tab="Zones" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_53" id_profile="Administrator" id_tab="Countries" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_54" id_profile="Administrator" id_tab="States" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_55" id_profile="Administrator" id_tab="Currencies" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_56" id_profile="Administrator" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_57" id_profile="Administrator" id_tab="Taxes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_58" id_profile="Administrator" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_59" id_profile="Administrator" id_tab="Modules_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_60" id_profile="Administrator" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_61" id_profile="Administrator" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_62" id_profile="Administrator" id_tab="Positions" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_63" id_profile="Administrator" id_tab="General" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_64" id_profile="Administrator" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_65" id_profile="Administrator" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_66" id_profile="Administrator" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_67" id_profile="Administrator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_68" id_profile="Administrator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_70" id_profile="Administrator" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_71" id_profile="Administrator" id_tab="Contact_stores" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_72" id_profile="Administrator" id_tab="Search_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_73" id_profile="Administrator" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_74" id_profile="Administrator" id_tab="Payment" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_75" id_profile="Administrator" id_tab="Maintenance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_76" id_profile="Administrator" id_tab="Orders_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_77" id_profile="Administrator" id_tab="Configuration_Information" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_78" id_profile="Administrator" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_79" id_profile="Administrator" id_tab="Subdomains" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_80" id_profile="Administrator" id_tab="DB_Backup" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_81" id_profile="Administrator" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_82" id_profile="Administrator" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_83" id_profile="Administrator" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_84" id_profile="Administrator" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_85" id_profile="Administrator" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_86" id_profile="Administrator" id_tab="Performance" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_87" id_profile="Administrator" id_tab="Preferences_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_88" id_profile="Administrator" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_89" id_profile="Administrator" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_90" id_profile="Administrator" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_91" id_profile="Administrator" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_92" id_profile="Administrator" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_93" id_profile="Administrator" id_tab="Stats_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_94" id_profile="Administrator" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_95" id_profile="Administrator" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_96" id_profile="Administrator" id_tab="Accounting_export" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_2_97" id_profile="Administrator" id_tab="Shops_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_98" id_profile="Administrator" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_99" id_profile="Administrator" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_100" id_profile="Administrator" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_101" id_profile="Administrator" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_102" id_profile="Administrator" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_103" id_profile="Administrator" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_104" id_profile="Administrator" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_105" id_profile="Administrator" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_106" id_profile="Administrator" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_107" id_profile="Administrator" id_tab="Customers_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_1" id_profile="Logistician" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_2" id_profile="Logistician" id_tab="tab_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_3" id_profile="Logistician" id_tab="CMS_pages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_4" id_profile="Logistician" id_tab="CMS_categories" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_5" id_profile="Logistician" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_6" id_profile="Logistician" id_tab="Search" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_7" id_profile="Logistician" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_8" id_profile="Logistician" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_9" id_profile="Logistician" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_10" id_profile="Logistician" id_tab="Price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_11" id_profile="Logistician" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_12" id_profile="Logistician" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_13" id_profile="Logistician" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_14" id_profile="Logistician" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_15" id_profile="Logistician" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_16" id_profile="Logistician" id_tab="tab_16" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_17" id_profile="Logistician" id_tab="Stats" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_18" id_profile="Logistician" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_19" id_profile="Logistician" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_20" id_profile="Logistician" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_21" id_profile="Logistician" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_22" id_profile="Logistician" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_23" id_profile="Logistician" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_24" id_profile="Logistician" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_25" id_profile="Logistician" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_26" id_profile="Logistician" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_27" id_profile="Logistician" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_28" id_profile="Logistician" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_29" id_profile="Logistician" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_30" id_profile="Logistician" id_tab="Orders_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_31" id_profile="Logistician" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_32" id_profile="Logistician" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_33" id_profile="Logistician" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_34" id_profile="Logistician" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_35" id_profile="Logistician" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_36" id_profile="Logistician" id_tab="Order_Messages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_37" id_profile="Logistician" id_tab="Customers_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_38" id_profile="Logistician" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_39" id_profile="Logistician" id_tab="Groups" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_40" id_profile="Logistician" id_tab="Shopping_Carts" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_41" id_profile="Logistician" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_42" id_profile="Logistician" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_43" id_profile="Logistician" id_tab="Outstanding" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_44" id_profile="Logistician" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_45" id_profile="Logistician" id_tab="Catalog_price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_46" id_profile="Logistician" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_47" id_profile="Logistician" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_48" id_profile="Logistician" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_49" id_profile="Logistician" id_tab="Shipping_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_50" id_profile="Logistician" id_tab="Localization_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_51" id_profile="Logistician" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_52" id_profile="Logistician" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_53" id_profile="Logistician" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_54" id_profile="Logistician" id_tab="States" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_55" id_profile="Logistician" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_56" id_profile="Logistician" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_57" id_profile="Logistician" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_58" id_profile="Logistician" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_59" id_profile="Logistician" id_tab="Modules_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_60" id_profile="Logistician" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_61" id_profile="Logistician" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_62" id_profile="Logistician" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_63" id_profile="Logistician" id_tab="General" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_64" id_profile="Logistician" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_65" id_profile="Logistician" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_66" id_profile="Logistician" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_67" id_profile="Logistician" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_68" id_profile="Logistician" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_70" id_profile="Logistician" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_71" id_profile="Logistician" id_tab="Contact_stores" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_72" id_profile="Logistician" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_73" id_profile="Logistician" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_74" id_profile="Logistician" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_75" id_profile="Logistician" id_tab="Maintenance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_76" id_profile="Logistician" id_tab="Orders_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_77" id_profile="Logistician" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_78" id_profile="Logistician" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_79" id_profile="Logistician" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_80" id_profile="Logistician" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_81" id_profile="Logistician" id_tab="Webservice" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_82" id_profile="Logistician" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_83" id_profile="Logistician" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_84" id_profile="Logistician" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_85" id_profile="Logistician" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_86" id_profile="Logistician" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_87" id_profile="Logistician" id_tab="Preferences_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_88" id_profile="Logistician" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_89" id_profile="Logistician" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_90" id_profile="Logistician" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_91" id_profile="Logistician" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_92" id_profile="Logistician" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_93" id_profile="Logistician" id_tab="Stats_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_94" id_profile="Logistician" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_95" id_profile="Logistician" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_96" id_profile="Logistician" id_tab="Accounting_export" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_97" id_profile="Logistician" id_tab="Shops_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_98" id_profile="Logistician" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_99" id_profile="Logistician" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_100" id_profile="Logistician" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_101" id_profile="Logistician" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_102" id_profile="Logistician" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_103" id_profile="Logistician" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_104" id_profile="Logistician" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_105" id_profile="Logistician" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_106" id_profile="Logistician" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_107" id_profile="Logistician" id_tab="Customers_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_1" id_profile="Translator" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_2" id_profile="Translator" id_tab="tab_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_3" id_profile="Translator" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_4" id_profile="Translator" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_5" id_profile="Translator" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_6" id_profile="Translator" id_tab="Search" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_4_7" id_profile="Translator" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_8" id_profile="Translator" id_tab="Orders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_9" id_profile="Translator" id_tab="Customers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_10" id_profile="Translator" id_tab="Price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_11" id_profile="Translator" id_tab="Shipping" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_12" id_profile="Translator" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_13" id_profile="Translator" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_14" id_profile="Translator" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_15" id_profile="Translator" id_tab="Tools" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_4_16" id_profile="Translator" id_tab="tab_16" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_17" id_profile="Translator" id_tab="Stats" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_18" id_profile="Translator" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_19" id_profile="Translator" id_tab="Stock" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_20" id_profile="Translator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_21" id_profile="Translator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_22" id_profile="Translator" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_23" id_profile="Translator" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_24" id_profile="Translator" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_25" id_profile="Translator" id_tab="Manufacturers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_26" id_profile="Translator" id_tab="Suppliers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_27" id_profile="Translator" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_28" id_profile="Translator" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_29" id_profile="Translator" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_30" id_profile="Translator" id_tab="Orders_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_31" id_profile="Translator" id_tab="Invoices" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_32" id_profile="Translator" id_tab="Merchandise_Returns" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_33" id_profile="Translator" id_tab="Delivery_Slips" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_34" id_profile="Translator" id_tab="Credit_Slips" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_35" id_profile="Translator" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_36" id_profile="Translator" id_tab="Order_Messages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_37" id_profile="Translator" id_tab="Customers_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_38" id_profile="Translator" id_tab="Addresses" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_39" id_profile="Translator" id_tab="Groups" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_40" id_profile="Translator" id_tab="Shopping_Carts" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_41" id_profile="Translator" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_42" id_profile="Translator" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_43" id_profile="Translator" id_tab="Outstanding" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_44" id_profile="Translator" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_45" id_profile="Translator" id_tab="Catalog_price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_46" id_profile="Translator" id_tab="Carriers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_47" id_profile="Translator" id_tab="Price_Ranges" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_48" id_profile="Translator" id_tab="Weight_Ranges" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_49" id_profile="Translator" id_tab="Shipping_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_50" id_profile="Translator" id_tab="Localization_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_51" id_profile="Translator" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_52" id_profile="Translator" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_53" id_profile="Translator" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_54" id_profile="Translator" id_tab="States" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_55" id_profile="Translator" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_56" id_profile="Translator" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_57" id_profile="Translator" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_58" id_profile="Translator" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_59" id_profile="Translator" id_tab="Modules_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_60" id_profile="Translator" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_61" id_profile="Translator" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_62" id_profile="Translator" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_63" id_profile="Translator" id_tab="General" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_64" id_profile="Translator" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_65" id_profile="Translator" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_66" id_profile="Translator" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_67" id_profile="Translator" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_68" id_profile="Translator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_70" id_profile="Translator" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_71" id_profile="Translator" id_tab="Contact_stores" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_72" id_profile="Translator" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_73" id_profile="Translator" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_74" id_profile="Translator" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_75" id_profile="Translator" id_tab="Maintenance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_76" id_profile="Translator" id_tab="Orders_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_77" id_profile="Translator" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_78" id_profile="Translator" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_79" id_profile="Translator" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_80" id_profile="Translator" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_81" id_profile="Translator" id_tab="Webservice" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_82" id_profile="Translator" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_83" id_profile="Translator" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_84" id_profile="Translator" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_85" id_profile="Translator" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_86" id_profile="Translator" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_87" id_profile="Translator" id_tab="Preferences_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_88" id_profile="Translator" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_89" id_profile="Translator" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_90" id_profile="Translator" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_91" id_profile="Translator" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_92" id_profile="Translator" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_93" id_profile="Translator" id_tab="Stats_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_94" id_profile="Translator" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_95" id_profile="Translator" id_tab="Referrers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_96" id_profile="Translator" id_tab="Accounting_export" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_97" id_profile="Translator" id_tab="Shops_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_98" id_profile="Translator" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_99" id_profile="Translator" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_100" id_profile="Translator" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_101" id_profile="Translator" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_102" id_profile="Translator" id_tab="Stock_Movement" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_103" id_profile="Translator" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_104" id_profile="Translator" id_tab="Stock_cover" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_105" id_profile="Translator" id_tab="Supply_orders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_106" id_profile="Translator" id_tab="Configuration" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_107" id_profile="Translator" id_tab="Customers_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_1" id_profile="Salesman" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_2" id_profile="Salesman" id_tab="tab_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_3" id_profile="Salesman" id_tab="CMS_pages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_4" id_profile="Salesman" id_tab="CMS_categories" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_5" id_profile="Salesman" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_6" id_profile="Salesman" id_tab="Search" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_7" id_profile="Salesman" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_8" id_profile="Salesman" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_9" id_profile="Salesman" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_10" id_profile="Salesman" id_tab="Price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_11" id_profile="Salesman" id_tab="Shipping" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_12" id_profile="Salesman" id_tab="Localization" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_13" id_profile="Salesman" id_tab="Modules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_14" id_profile="Salesman" id_tab="Preferences" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_15" id_profile="Salesman" id_tab="Tools" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_16" id_profile="Salesman" id_tab="tab_16" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_17" id_profile="Salesman" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_18" id_profile="Salesman" id_tab="Shops" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_19" id_profile="Salesman" id_tab="Stock" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_20" id_profile="Salesman" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_21" id_profile="Salesman" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_22" id_profile="Salesman" id_tab="Monitoring" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_23" id_profile="Salesman" id_tab="Attributes_and_Values" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_24" id_profile="Salesman" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_25" id_profile="Salesman" id_tab="Manufacturers" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_26" id_profile="Salesman" id_tab="Suppliers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_27" id_profile="Salesman" id_tab="Image_Mapping" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_28" id_profile="Salesman" id_tab="Tags" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_29" id_profile="Salesman" id_tab="Attachments" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_30" id_profile="Salesman" id_tab="Orders_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_31" id_profile="Salesman" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_32" id_profile="Salesman" id_tab="Merchandise_Returns" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_33" id_profile="Salesman" id_tab="Delivery_Slips" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_34" id_profile="Salesman" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_35" id_profile="Salesman" id_tab="Statuses" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_36" id_profile="Salesman" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_37" id_profile="Salesman" id_tab="Customers_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_38" id_profile="Salesman" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_39" id_profile="Salesman" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_40" id_profile="Salesman" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_41" id_profile="Salesman" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_42" id_profile="Salesman" id_tab="Customer_Service" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_43" id_profile="Salesman" id_tab="Outstanding" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_44" id_profile="Salesman" id_tab="Cart_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_45" id_profile="Salesman" id_tab="Catalog_price_rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_46" id_profile="Salesman" id_tab="Carriers" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_47" id_profile="Salesman" id_tab="Price_Ranges" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_48" id_profile="Salesman" id_tab="Weight_Ranges" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_49" id_profile="Salesman" id_tab="Shipping_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_50" id_profile="Salesman" id_tab="Localization_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_51" id_profile="Salesman" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_52" id_profile="Salesman" id_tab="Zones" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_53" id_profile="Salesman" id_tab="Countries" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_54" id_profile="Salesman" id_tab="States" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_55" id_profile="Salesman" id_tab="Currencies" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_56" id_profile="Salesman" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_57" id_profile="Salesman" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_58" id_profile="Salesman" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_59" id_profile="Salesman" id_tab="Modules_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_60" id_profile="Salesman" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_61" id_profile="Salesman" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_62" id_profile="Salesman" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_63" id_profile="Salesman" id_tab="General" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_64" id_profile="Salesman" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_65" id_profile="Salesman" id_tab="SEO_URLs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_66" id_profile="Salesman" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_67" id_profile="Salesman" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_68" id_profile="Salesman" id_tab="CMS" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_70" id_profile="Salesman" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_71" id_profile="Salesman" id_tab="Contact_stores" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_72" id_profile="Salesman" id_tab="Search_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_73" id_profile="Salesman" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_74" id_profile="Salesman" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_75" id_profile="Salesman" id_tab="Maintenance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_76" id_profile="Salesman" id_tab="Orders_2" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_77" id_profile="Salesman" id_tab="Configuration_Information" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_78" id_profile="Salesman" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_79" id_profile="Salesman" id_tab="Subdomains" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_80" id_profile="Salesman" id_tab="DB_Backup" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_81" id_profile="Salesman" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_82" id_profile="Salesman" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_83" id_profile="Salesman" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_84" id_profile="Salesman" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_85" id_profile="Salesman" id_tab="Accounting" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_86" id_profile="Salesman" id_tab="Performance" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_87" id_profile="Salesman" id_tab="Preferences_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_88" id_profile="Salesman" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_89" id_profile="Salesman" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_90" id_profile="Salesman" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_91" id_profile="Salesman" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_92" id_profile="Salesman" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_93" id_profile="Salesman" id_tab="Stats_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_94" id_profile="Salesman" id_tab="Search_Engines" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_95" id_profile="Salesman" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_96" id_profile="Salesman" id_tab="Accounting_export" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_97" id_profile="Salesman" id_tab="Shops_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_98" id_profile="Salesman" id_tab="Group_Shops" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_99" id_profile="Salesman" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_100" id_profile="Salesman" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_101" id_profile="Salesman" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_102" id_profile="Salesman" id_tab="Stock_Movement" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_103" id_profile="Salesman" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_104" id_profile="Salesman" id_tab="Stock_cover" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_105" id_profile="Salesman" id_tab="Supply_orders" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_106" id_profile="Salesman" id_tab="Configuration" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_107" id_profile="Salesman" id_tab="Customers_2" view="0" add="0" edit="0" delete="0"/>
  </entities>
 </entity_access>
@@ -7,86 +7,96 @@
  <tab id="Combinations_generator" name="Combinations generator"/>
  <tab id="Search" name="Suche"/>
  <tab id="Catalog" name="Katalog"/>
-  <tab id="Customers" name="Kunden"/>
  <tab id="Orders" name="Bestellungen"/>
-  <tab id="Payment" name="Zahlung"/>
+  <tab id="Customers" name="Kunden"/>
+  <tab id="Price_rules" name="Price rules"/>
  <tab id="Shipping" name="Versandkosten"/>
-  <tab id="Stats" name="Statistik"/>
+  <tab id="Localization" name="Lokalisierung"/>
  <tab id="Modules" name="Module"/>
-  <tab id="Employees" name="Mitarbeiter"/>
  <tab id="Preferences" name="Voreinstellungen"/>
  <tab id="Tools" name="Tools"/>
+  <tab id="tab_16" name=""/>
+  <tab id="Stats" name="Statistik"/>
  <tab id="Shops" name="Shops"/>
  <tab id="Stock" name="Stock"/>
-  <tab id="Accounting" name="Accounting"/>
  <tab id="Products" name="Products"/>
  <tab id="Categories" name="Categories"/>
  <tab id="Monitoring" name="Tracking"/>
-  <tab id="Manufacturers" name="Hersteller"/>
-  <tab id="Suppliers" name="Zulieferer"/>
  <tab id="Attributes_and_Values" name="Attribute und Werte"/>
  <tab id="Features" name="Funktionen"/>
+  <tab id="Manufacturers" name="Hersteller"/>
+  <tab id="Suppliers" name="Zulieferer"/>
  <tab id="Image_Mapping" name="Image Mapping"/>
  <tab id="Tags" name="Tags"/>
  <tab id="Attachments" name="Anh&#xE4;nge"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Addresses" name="Adressen"/>
-  <tab id="Groups" name="Gruppen"/>
-  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Orders_1" name="Bestellungen"/>
  <tab id="Invoices" name="Rechnungen"/>
-  <tab id="Delivery_Slips" name="Lieferscheine"/>
  <tab id="Merchandise_Returns" name="Warenr&#xFC;cksendungen"/>
+  <tab id="Delivery_Slips" name="Lieferscheine"/>
  <tab id="Credit_Slips" name="Gutscheine"/>
  <tab id="Statuses" name="Status"/>
  <tab id="Order_Messages" name="Bestellnachrichten"/>
-  <tab id="Currencies" name="W&#xE4;hrungen"/>
-  <tab id="Taxes" name="Steuern"/>
-  <tab id="Tax_Rules" name="Steuerregeln"/>
+  <tab id="Customers_1" name="Kunden"/>
+  <tab id="Addresses" name="Adressen"/>
+  <tab id="Groups" name="Gruppen"/>
+  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
+  <tab id="Customer_Service" name="Kundenservice"/>
+  <tab id="Contacts" name="Kontakte"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
  <tab id="Cart_Rules" name="Gutscheine"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
+  <tab id="Shipping_1" name="Versandkosten"/>
  <tab id="Carriers" name="Versanddienst"/>
-  <tab id="States" name="Staaten"/>
-  <tab id="Countries" name="L&#xE4;nder"/>
-  <tab id="Zones" name="Zonen"/>
  <tab id="Price_Ranges" name="Preisspanne"/>
  <tab id="Weight_Ranges" name="Gewichtsklassen"/>
-  <tab id="Search_Engines" name="Suchmaschinen"/>
-  <tab id="Referrers" name="Referrer"/>
+  <tab id="Localization_1" name="Lokalisierung"/>
+  <tab id="Languages" name="Sprachen"/>
+  <tab id="Zones" name="Zonen"/>
+  <tab id="Countries" name="L&#xE4;nder"/>
+  <tab id="States" name="Staaten"/>
+  <tab id="Currencies" name="W&#xE4;hrungen"/>
+  <tab id="Tax_Rules" name="Steuerregeln"/>
+  <tab id="Taxes" name="Steuern"/>
+  <tab id="Translations" name="&#xDC;bersetzungen"/>
+  <tab id="Modules_1" name="Module"/>
  <tab id="Modules_Themes_Catalog" name="Module und Themenkatalog"/>
  <tab id="My_Account" name="Mein Konto"/>
-  <tab id="Themes" name="Themen"/>
  <tab id="Positions" name="Positionen"/>
+  <tab id="Payment" name="Zahlung"/>
+  <tab id="General" name="General"/>
+  <tab id="Orders_2" name="Bestellungen"/>
+  <tab id="Products_1" name="Produkte"/>
+  <tab id="Customers_2" name="Kunden"/>
+  <tab id="Themes" name="Themen"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Images" name="Bild"/>
+  <tab id="Contact_stores" name="Contact &amp; stores"/>
+  <tab id="Search_1" name="Suche"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Geolocation" name="Geotargeting"/>
+  <tab id="Configuration_Information" name="Konfigurationsinformationen"/>
+  <tab id="Performance" name="Leistung"/>
+  <tab id="E-mail" name="E-Mail"/>
+  <tab id="CSV_Import" name="Import"/>
+  <tab id="DB_Backup" name="DB-Backup"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Logs" name="Log"/>
+  <tab id="Subdomains" name="Subdomains"/>
+  <tab id="Webservice" name="Webservice"/>
+  <tab id="Preferences_1" name="Voreinstellungen"/>
+  <tab id="Quick_Access" name="Schnellzugriff"/>
+  <tab id="Employees" name="Mitarbeiter"/>
  <tab id="Profiles" name="Profile"/>
  <tab id="Permissions" name="Berechtigungen"/>
-  <tab id="Contacts" name="Kontakte"/>
  <tab id="Tabs" name="Tabs"/>
-  <tab id="Customer_Service" name="Kundenservice"/>
-  <tab id="Contact_Information" name="Kontaktinformation"/>
-  <tab id="Themes_1" name="Themen"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Products_1" name="Produkte"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="E-mail" name="E-Mail"/>
-  <tab id="Images" name="Bild"/>
-  <tab id="Database" name="Datenbank"/>
-  <tab id="Localization" name="Lokalisierung"/>
-  <tab id="Search_1" name="Suche"/>
-  <tab id="Performance" name="Leistung"/>
-  <tab id="Geolocation" name="Geotargeting"/>
-  <tab id="Languages" name="Sprachen"/>
-  <tab id="Translations" name="&#xDC;bersetzungen"/>
-  <tab id="Quick_Access" name="Schnellzugriff"/>
-  <tab id="Configuration_Information" name="Konfigurationsinformationen"/>
-  <tab id="CSV_Import" name="Import"/>
-  <tab id="Subdomains" name="Subdomains"/>
-  <tab id="DB_Backup" name="DB-Backup"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Generators" name="Generatoren"/>
-  <tab id="Stores" name="Shops"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Stats_1" name="Statistik"/>
+  <tab id="Search_Engines" name="Suchmaschinen"/>
+  <tab id="Referrers" name="Referrer"/>
+  <tab id="Accounting_export" name="Accounting export"/>
+  <tab id="Shops_1" name="Shops"/>
  <tab id="Group_Shops" name="Group Shops"/>
  <tab id="Shop_Urls" name="Shop Urls"/>
  <tab id="Warehouses" name="Warehouses"/>
@@ -96,7 +106,4 @@
  <tab id="Stock_cover" name="Stock cover"/>
  <tab id="Supply_orders" name="Supply orders"/>
  <tab id="Configuration" name="Configuration"/>
-  <tab id="Account_Number_Management" name="Account Number Management"/>
-  <tab id="Export" name="Export"/>
-  <tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
 </entity_tab>
@@ -7,86 +7,96 @@
  <tab id="Combinations_generator" name="Combinations generator"/>
  <tab id="Search" name="Search"/>
  <tab id="Catalog" name="Catalog"/>
-  <tab id="Customers" name="Customers"/>
  <tab id="Orders" name="Orders"/>
-  <tab id="Payment" name="Payment"/>
+  <tab id="Customers" name="Customers"/>
+  <tab id="Price_rules" name="Price rules"/>
  <tab id="Shipping" name="Shipping"/>
-  <tab id="Stats" name="Stats"/>
+  <tab id="Localization" name="Localization"/>
  <tab id="Modules" name="Modules"/>
-  <tab id="Employees" name="Employees"/>
  <tab id="Preferences" name="Preferences"/>
  <tab id="Tools" name="Tools"/>
+  <tab id="tab_16" name=""/>
+  <tab id="Stats" name="Stats"/>
  <tab id="Shops" name="Shops"/>
  <tab id="Stock" name="Stock"/>
-  <tab id="Accounting" name="Accounting"/>
  <tab id="Products" name="Products"/>
  <tab id="Categories" name="Categories"/>
  <tab id="Monitoring" name="Monitoring"/>
-  <tab id="Manufacturers" name="Manufacturers"/>
-  <tab id="Suppliers" name="Suppliers"/>
  <tab id="Attributes_and_Values" name="Attributes and Values"/>
  <tab id="Features" name="Features"/>
+  <tab id="Manufacturers" name="Manufacturers"/>
+  <tab id="Suppliers" name="Suppliers"/>
  <tab id="Image_Mapping" name="Image Mapping"/>
  <tab id="Tags" name="Tags"/>
  <tab id="Attachments" name="Attachments"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Addresses" name="Addresses"/>
-  <tab id="Groups" name="Groups"/>
-  <tab id="Shopping_Carts" name="Shopping Carts"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Orders_1" name="Orders"/>
  <tab id="Invoices" name="Invoices"/>
-  <tab id="Delivery_Slips" name="Delivery Slips"/>
  <tab id="Merchandise_Returns" name="Merchandise Returns"/>
+  <tab id="Delivery_Slips" name="Delivery Slips"/>
  <tab id="Credit_Slips" name="Credit Slips"/>
  <tab id="Statuses" name="Statuses"/>
  <tab id="Order_Messages" name="Order Messages"/>
-  <tab id="Currencies" name="Currencies"/>
-  <tab id="Taxes" name="Taxes"/>
-  <tab id="Tax_Rules" name="Tax Rules"/>
+  <tab id="Customers_1" name="Customers"/>
+  <tab id="Addresses" name="Addresses"/>
+  <tab id="Groups" name="Groups"/>
+  <tab id="Shopping_Carts" name="Shopping Carts"/>
+  <tab id="Customer_Service" name="Customer Service"/>
+  <tab id="Contacts" name="Contacts"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
  <tab id="Cart_Rules" name="Cart Rules"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
+  <tab id="Shipping_1" name="Shipping"/>
  <tab id="Carriers" name="Carriers"/>
-  <tab id="States" name="States"/>
-  <tab id="Countries" name="Countries"/>
-  <tab id="Zones" name="Zones"/>
  <tab id="Price_Ranges" name="Price Ranges"/>
  <tab id="Weight_Ranges" name="Weight Ranges"/>
-  <tab id="Search_Engines" name="Search Engines"/>
-  <tab id="Referrers" name="Referrers"/>
+  <tab id="Localization_1" name="Localization"/>
+  <tab id="Languages" name="Languages"/>
+  <tab id="Zones" name="Zones"/>
+  <tab id="Countries" name="Countries"/>
+  <tab id="States" name="States"/>
+  <tab id="Currencies" name="Currencies"/>
+  <tab id="Tax_Rules" name="Tax Rules"/>
+  <tab id="Taxes" name="Taxes"/>
+  <tab id="Translations" name="Translations"/>
+  <tab id="Modules_1" name="Modules"/>
  <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
  <tab id="My_Account" name="My Account"/>
-  <tab id="Themes" name="Themes"/>
  <tab id="Positions" name="Positions"/>
+  <tab id="Payment" name="Payment"/>
+  <tab id="General" name="General"/>
+  <tab id="Orders_2" name="Orders"/>
+  <tab id="Products_1" name="Products"/>
+  <tab id="Customers_2" name="Customers"/>
+  <tab id="Themes" name="Themes"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Images" name="Images"/>
+  <tab id="Contact_stores" name="Contact &amp; stores"/>
+  <tab id="Search_1" name="Search"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Geolocation" name="Geolocation"/>
+  <tab id="Configuration_Information" name="Configuration Information"/>
+  <tab id="Performance" name="Performance"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="CSV_Import" name="CSV Import"/>
+  <tab id="DB_Backup" name="DB Backup"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Logs" name="Logs"/>
+  <tab id="Subdomains" name="Subdomains"/>
+  <tab id="Webservice" name="Webservice"/>
+  <tab id="Preferences_1" name="Preferences"/>
+  <tab id="Quick_Access" name="Quick Access"/>
+  <tab id="Employees" name="Employees"/>
  <tab id="Profiles" name="Profiles"/>
  <tab id="Permissions" name="Permissions"/>
-  <tab id="Contacts" name="Contacts"/>
  <tab id="Tabs" name="Tabs"/>
-  <tab id="Customer_Service" name="Customer Service"/>
-  <tab id="Contact_Information" name="Contact Information"/>
-  <tab id="Themes_1" name="Themes"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Keyword_Typos" name="Keyword Typos"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Database" name="Database"/>
-  <tab id="Localization" name="Localization"/>
-  <tab id="Search_1" name="Search"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="Geolocation" name="Geolocation"/>
-  <tab id="Languages" name="Languages"/>
-  <tab id="Translations" name="Translations"/>
-  <tab id="Quick_Access" name="Quick Access"/>
-  <tab id="Configuration_Information" name="Configuration Information"/>
-  <tab id="CSV_Import" name="CSV Import"/>
-  <tab id="Subdomains" name="Subdomains"/>
-  <tab id="DB_Backup" name="DB Backup"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Generators" name="Generators"/>
-  <tab id="Stores" name="Stores"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Logs" name="Logs"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Stats_1" name="Stats"/>
+  <tab id="Search_Engines" name="Search Engines"/>
+  <tab id="Referrers" name="Referrers"/>
+  <tab id="Accounting_export" name="Accounting export"/>
+  <tab id="Shops_1" name="Shops"/>
  <tab id="Group_Shops" name="Group Shops"/>
  <tab id="Shop_Urls" name="Shop Urls"/>
  <tab id="Warehouses" name="Warehouses"/>
@@ -96,7 +106,4 @@
  <tab id="Stock_cover" name="Stock cover"/>
  <tab id="Supply_orders" name="Supply orders"/>
  <tab id="Configuration" name="Configuration"/>
-  <tab id="Account_Number_Management" name="Account Number Management"/>
-  <tab id="Export" name="Export"/>
-  <tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
 </entity_tab>
@@ -7,86 +7,96 @@
  <tab id="Combinations_generator" name="Combinations generator"/>
  <tab id="Search" name="B&#xFA;squeda"/>
  <tab id="Catalog" name="Cat&#xE1;logo"/>
-  <tab id="Customers" name="Clientes"/>
  <tab id="Orders" name="Pedidos"/>
-  <tab id="Payment" name="Pago"/>
+  <tab id="Customers" name="Clientes"/>
+  <tab id="Price_rules" name="Price rules"/>
  <tab id="Shipping" name="Transporte"/>
-  <tab id="Stats" name="Estad&#xED;sticas"/>
+  <tab id="Localization" name="Ubicaci&#xF3;n"/>
  <tab id="Modules" name="M&#xF3;dulos"/>
-  <tab id="Employees" name="Empleados"/>
  <tab id="Preferences" name="Preferencias"/>
  <tab id="Tools" name="Herramientas"/>
+  <tab id="tab_16" name=""/>
+  <tab id="Stats" name="Estad&#xED;sticas"/>
  <tab id="Shops" name="Shops"/>
  <tab id="Stock" name="Stock"/>
-  <tab id="Accounting" name="Accounting"/>
  <tab id="Products" name="Products"/>
  <tab id="Categories" name="Categories"/>
  <tab id="Monitoring" name="Rastreo"/>
-  <tab id="Manufacturers" name="Fabricantes"/>
-  <tab id="Suppliers" name="Proveedores"/>
  <tab id="Attributes_and_Values" name="Atributos y Valores"/>
  <tab id="Features" name="Caracter&#xED;sticas"/>
+  <tab id="Manufacturers" name="Fabricantes"/>
+  <tab id="Suppliers" name="Proveedores"/>
  <tab id="Image_Mapping" name="Mapeo de la imagen"/>
  <tab id="Tags" name="Etiquetas"/>
  <tab id="Attachments" name="Adjuntos"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Addresses" name="Direcciones"/>
-  <tab id="Groups" name="Grupos"/>
-  <tab id="Shopping_Carts" name="Carritos"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Orders_1" name="Pedidos"/>
  <tab id="Invoices" name="Facturas"/>
-  <tab id="Delivery_Slips" name="Albaranes de entrega"/>
  <tab id="Merchandise_Returns" name="Devoluci&#xF3;n productos"/>
+  <tab id="Delivery_Slips" name="Albaranes de entrega"/>
  <tab id="Credit_Slips" name="Vales"/>
  <tab id="Statuses" name="Estados"/>
  <tab id="Order_Messages" name="Mensajes de Orden"/>
-  <tab id="Currencies" name="Divisas"/>
-  <tab id="Taxes" name="Impuestos"/>
-  <tab id="Tax_Rules" name="Reglas de Impuestos"/>
+  <tab id="Customers_1" name="Clientes"/>
+  <tab id="Addresses" name="Direcciones"/>
+  <tab id="Groups" name="Grupos"/>
+  <tab id="Shopping_Carts" name="Carritos"/>
+  <tab id="Customer_Service" name="Servicio al cliente"/>
+  <tab id="Contacts" name="Contactos"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
  <tab id="Cart_Rules" name="Vales de descuento"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
+  <tab id="Shipping_1" name="Transporte"/>
  <tab id="Carriers" name="Transportistas"/>
-  <tab id="States" name="Estados"/>
-  <tab id="Countries" name="Pa&#xED;ses"/>
-  <tab id="Zones" name="Zonas"/>
  <tab id="Price_Ranges" name="Franja de precios"/>
  <tab id="Weight_Ranges" name="Franja de pesos"/>
-  <tab id="Search_Engines" name="Motores de b&#xFA;squeda"/>
-  <tab id="Referrers" name="Referido"/>
+  <tab id="Localization_1" name="Ubicaci&#xF3;n"/>
+  <tab id="Languages" name="Idiomas"/>
+  <tab id="Zones" name="Zonas"/>
+  <tab id="Countries" name="Pa&#xED;ses"/>
+  <tab id="States" name="Estados"/>
+  <tab id="Currencies" name="Divisas"/>
+  <tab id="Tax_Rules" name="Reglas de Impuestos"/>
+  <tab id="Taxes" name="Impuestos"/>
+  <tab id="Translations" name="Traducciones"/>
+  <tab id="Modules_1" name="M&#xF3;dulos"/>
  <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
  <tab id="My_Account" name="My Account"/>
-  <tab id="Themes" name="Temas"/>
  <tab id="Positions" name="Posiciones"/>
+  <tab id="Payment" name="Pago"/>
+  <tab id="General" name="General"/>
+  <tab id="Orders_2" name="Pedidos"/>
+  <tab id="Products_1" name="Productos"/>
+  <tab id="Customers_2" name="Clientes"/>
+  <tab id="Themes" name="Temas"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Images" name="Im&#xE1;genes"/>
+  <tab id="Contact_stores" name="Contact &amp; stores"/>
+  <tab id="Search_1" name="B&#xFA;squeda"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Geolocation" name="Geolocalizaci&#xF3;n"/>
+  <tab id="Configuration_Information" name="Informaciones"/>
+  <tab id="Performance" name="Rendimiento"/>
+  <tab id="E-mail" name="Emails"/>
+  <tab id="CSV_Import" name="Importar"/>
+  <tab id="DB_Backup" name="Copia de seguridad"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Logs" name="Log"/>
+  <tab id="Subdomains" name="Subcampos"/>
+  <tab id="Webservice" name="Web service"/>
+  <tab id="Preferences_1" name="Preferencias"/>
+  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
+  <tab id="Employees" name="Empleados"/>
  <tab id="Profiles" name="Perfiles"/>
  <tab id="Permissions" name="Permisos"/>
-  <tab id="Contacts" name="Contactos"/>
  <tab id="Tabs" name="Pesta&#xF1;as"/>
-  <tab id="Customer_Service" name="Servicio al cliente"/>
-  <tab id="Contact_Information" name="Datos"/>
-  <tab id="Themes_1" name="Temas"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Products_1" name="Productos"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="E-mail" name="Emails"/>
-  <tab id="Images" name="Im&#xE1;genes"/>
-  <tab id="Database" name="Base de datos"/>
-  <tab id="Localization" name="Ubicaci&#xF3;n"/>
-  <tab id="Search_1" name="B&#xFA;squeda"/>
-  <tab id="Performance" name="Rendimiento"/>
-  <tab id="Geolocation" name="Geolocalizaci&#xF3;n"/>
-  <tab id="Languages" name="Idiomas"/>
-  <tab id="Translations" name="Traducciones"/>
-  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
-  <tab id="Configuration_Information" name="Informaciones"/>
-  <tab id="CSV_Import" name="Importar"/>
-  <tab id="Subdomains" name="Subcampos"/>
-  <tab id="DB_Backup" name="Copia de seguridad"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Generators" name="Generadores"/>
-  <tab id="Stores" name="Tiendas"/>
-  <tab id="Webservice" name="Web service"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Stats_1" name="Estad&#xED;sticas"/>
+  <tab id="Search_Engines" name="Motores de b&#xFA;squeda"/>
+  <tab id="Referrers" name="Referido"/>
+  <tab id="Accounting_export" name="Accounting export"/>
+  <tab id="Shops_1" name="Shops"/>
  <tab id="Group_Shops" name="Group Shops"/>
  <tab id="Shop_Urls" name="Shop Urls"/>
  <tab id="Warehouses" name="Warehouses"/>
@@ -96,7 +106,4 @@
  <tab id="Stock_cover" name="Stock cover"/>
  <tab id="Supply_orders" name="Supply orders"/>
  <tab id="Configuration" name="Configuration"/>
-  <tab id="Account_Number_Management" name="Account Number Management"/>
-  <tab id="Export" name="Export"/>
-  <tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
 </entity_tab>
@@ -7,86 +7,96 @@
  <tab id="Combinations_generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
  <tab id="Search" name="Recherche"/>
  <tab id="Catalog" name="Catalogue"/>
-  <tab id="Customers" name="Clients"/>
  <tab id="Orders" name="Commandes"/>
-  <tab id="Payment" name="Paiement"/>
+  <tab id="Customers" name="Clients"/>
+  <tab id="Price_rules" name="Promotions"/>
  <tab id="Shipping" name="Transport"/>
-  <tab id="Stats" name="Stats"/>
+  <tab id="Localization" name="Localisation"/>
  <tab id="Modules" name="Modules"/>
-  <tab id="Employees" name="Employ&#xE9;s"/>
  <tab id="Preferences" name="Pr&#xE9;f&#xE9;rences"/>
  <tab id="Tools" name="Outils"/>
+  <tab id="tab_16" name="Administration"/>
+  <tab id="Stats" name="Stats"/>
  <tab id="Shops" name="Boutiques"/>
  <tab id="Stock" name="Stock"/>
-  <tab id="Accounting" name="Comptabilit&#xE9;"/>
  <tab id="Products" name="Produits"/>
  <tab id="Categories" name="Cat&#xE9;gories"/>
  <tab id="Monitoring" name="Suivi"/>
-  <tab id="Manufacturers" name="Marques"/>
-  <tab id="Suppliers" name="Fournisseurs"/>
  <tab id="Attributes_and_Values" name="Attributs et Valeurs"/>
  <tab id="Features" name="Caract&#xE9;ristiques"/>
+  <tab id="Manufacturers" name="Marques"/>
+  <tab id="Suppliers" name="Fournisseurs"/>
  <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
  <tab id="Tags" name="Tags"/>
  <tab id="Attachments" name="Documents joints"/>
-  <tab id="Catalog_price_rules" name="R&#xE8;gles de prix catalogue"/>
-  <tab id="Addresses" name="Adresses"/>
-  <tab id="Groups" name="Groupes"/>
-  <tab id="Shopping_Carts" name="Paniers"/>
-  <tab id="Genders" name="Genres"/>
-  <tab id="Outstanding" name="Encours"/>
+  <tab id="Orders_1" name="Commandes"/>
  <tab id="Invoices" name="Factures"/>
-  <tab id="Delivery_Slips" name="Bons de livraison"/>
  <tab id="Merchandise_Returns" name="Retours produits"/>
+  <tab id="Delivery_Slips" name="Bons de livraison"/>
  <tab id="Credit_Slips" name="Avoirs"/>
  <tab id="Statuses" name="Statuts"/>
  <tab id="Order_Messages" name="Messages pr&#xE9;d&#xE9;finis"/>
-  <tab id="Currencies" name="Devises"/>
-  <tab id="Taxes" name="Taxes"/>
-  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
+  <tab id="Customers_1" name="Clients"/>
+  <tab id="Addresses" name="Adresses"/>
+  <tab id="Groups" name="Groupes"/>
+  <tab id="Shopping_Carts" name="Paniers"/>
+  <tab id="Customer_Service" name="SAV"/>
+  <tab id="Contacts" name="Contacts"/>
+  <tab id="Genders" name="Genres"/>
+  <tab id="Outstanding" name="Encours"/>
  <tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
+  <tab id="Catalog_price_rules" name="R&#xE8;gles de prix catalogue"/>
+  <tab id="Shipping_1" name="Transport"/>
  <tab id="Carriers" name="Transporteurs"/>
-  <tab id="States" name="Etats"/>
-  <tab id="Countries" name="Pays"/>
-  <tab id="Zones" name="Zones"/>
  <tab id="Price_Ranges" name="Tranches de prix"/>
  <tab id="Weight_Ranges" name="Tranches de poids"/>
-  <tab id="Search_Engines" name="Moteurs de recherche"/>
-  <tab id="Referrers" name="Sites affluents"/>
+  <tab id="Localization_1" name="Localisation"/>
+  <tab id="Languages" name="Langues"/>
+  <tab id="Zones" name="Zones"/>
+  <tab id="Countries" name="Pays"/>
+  <tab id="States" name="Etats"/>
+  <tab id="Currencies" name="Devises"/>
+  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
+  <tab id="Taxes" name="Taxes"/>
+  <tab id="Translations" name="Traductions"/>
+  <tab id="Modules_1" name="Modules"/>
  <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
  <tab id="My_Account" name="Mon compte"/>
-  <tab id="Themes" name="Th&#xE8;mes"/>
  <tab id="Positions" name="Positions"/>
+  <tab id="Payment" name="Paiement"/>
+  <tab id="General" name="G&#xE9;n&#xE9;rales"/>
+  <tab id="Orders_2" name="Commandes"/>
+  <tab id="Products_1" name="Produits"/>
+  <tab id="Customers_2" name="Clients"/>
+  <tab id="Themes" name="Th&#xE8;mes"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Images" name="Images"/>
+  <tab id="Contact_stores" name="Coordonn&#xE9;es &amp; magasins"/>
+  <tab id="Search_1" name="Recherche"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Geolocation" name="G&#xE9;olocalisation"/>
+  <tab id="Configuration_Information" name="Informations"/>
+  <tab id="Performance" name="Performances"/>
+  <tab id="E-mail" name="Emails"/>
+  <tab id="CSV_Import" name="Import"/>
+  <tab id="DB_Backup" name="Sauvegarde BDD"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Accounting" name="Comptabilit&#xE9;"/>
+  <tab id="Logs" name="Log"/>
+  <tab id="Subdomains" name="Sous domaines"/>
+  <tab id="Webservice" name="Service web"/>
+  <tab id="Preferences_1" name="Pr&#xE9;f&#xE9;rences"/>
+  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
+  <tab id="Employees" name="Employ&#xE9;s"/>
  <tab id="Profiles" name="Profils"/>
  <tab id="Permissions" name="Permissions"/>
-  <tab id="Contacts" name="Contacts"/>
  <tab id="Tabs" name="Onglets"/>
-  <tab id="Customer_Service" name="SAV"/>
-  <tab id="Contact_Information" name="Coordonn&#xE9;es"/>
-  <tab id="Themes_1" name="Th&#xE8;mes"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Products_1" name="Produits"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="E-mail" name="Emails"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Database" name="Base de donn&#xE9;es"/>
-  <tab id="Localization" name="Localisation"/>
-  <tab id="Search_1" name="Recherche"/>
-  <tab id="Performance" name="Performances"/>
-  <tab id="Geolocation" name="G&#xE9;olocalisation"/>
-  <tab id="Languages" name="Langues"/>
-  <tab id="Translations" name="Traductions"/>
-  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
-  <tab id="Configuration_Information" name="Informations"/>
-  <tab id="CSV_Import" name="Import"/>
-  <tab id="Subdomains" name="Sous domaines"/>
-  <tab id="DB_Backup" name="Sauvegarde BDD"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Generators" name="G&#xE9;n&#xE9;rateurs"/>
-  <tab id="Stores" name="Magasins"/>
-  <tab id="Webservice" name="Service web"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Stats_1" name="Stats"/>
+  <tab id="Search_Engines" name="Moteurs de recherche"/>
+  <tab id="Referrers" name="Sites affluents"/>
+  <tab id="Accounting_export" name="Export comptable"/>
+  <tab id="Shops_1" name="Boutiques"/>
  <tab id="Group_Shops" name="Groupes de boutique"/>
  <tab id="Shop_Urls" name="URLs de boutique"/>
  <tab id="Warehouses" name="Entrep&#xF4;ts"/>
@@ -96,7 +106,4 @@
  <tab id="Stock_cover" name="Couverture du stock"/>
  <tab id="Supply_orders" name="Commandes fournisseurs"/>
  <tab id="Configuration" name="Configuration"/>
-  <tab id="Account_Number_Management" name="Gestion des num&#xE9;ros de comptes"/>
-  <tab id="Export" name="Export"/>
-  <tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
 </entity_tab>
@@ -7,86 +7,96 @@
  <tab id="Combinations_generator" name="Combinations generator"/>
  <tab id="Search" name="Cerca"/>
  <tab id="Catalog" name="Catalogo"/>
-  <tab id="Customers" name="Clienti"/>
  <tab id="Orders" name="Ordini"/>
-  <tab id="Payment" name="Pagamento"/>
+  <tab id="Customers" name="Clienti"/>
+  <tab id="Price_rules" name="Price rules"/>
  <tab id="Shipping" name="Spedizione"/>
-  <tab id="Stats" name="Stat"/>
+  <tab id="Localization" name="Localizzazione"/>
  <tab id="Modules" name="Moduli"/>
-  <tab id="Employees" name="Impiegati"/>
  <tab id="Preferences" name="Preferenze"/>
  <tab id="Tools" name="Strumenti"/>
+  <tab id="tab_16" name=""/>
+  <tab id="Stats" name="Stat"/>
  <tab id="Shops" name="Shops"/>
  <tab id="Stock" name="Stock"/>
-  <tab id="Accounting" name="Accounting"/>
  <tab id="Products" name="Products"/>
  <tab id="Categories" name="Categories"/>
  <tab id="Monitoring" name="Rintracciare"/>
-  <tab id="Manufacturers" name="Produttori"/>
-  <tab id="Suppliers" name="Fornitori"/>
  <tab id="Attributes_and_Values" name="Attributi e Valori"/>
  <tab id="Features" name="Caratteristiche"/>
+  <tab id="Manufacturers" name="Produttori"/>
+  <tab id="Suppliers" name="Fornitori"/>
  <tab id="Image_Mapping" name="Mappatura immagine"/>
  <tab id="Tags" name="Tag"/>
  <tab id="Attachments" name="Allegati"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Addresses" name="Indirizzi"/>
-  <tab id="Groups" name="Gruppi"/>
-  <tab id="Shopping_Carts" name="Carrelli shopping"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Orders_1" name="Ordini"/>
  <tab id="Invoices" name="Fatture"/>
-  <tab id="Delivery_Slips" name="Note di consegna"/>
  <tab id="Merchandise_Returns" name="Resi merci"/>
+  <tab id="Delivery_Slips" name="Note di consegna"/>
  <tab id="Credit_Slips" name="Note di credito"/>
  <tab id="Statuses" name="Status"/>
  <tab id="Order_Messages" name="Messaggi ordine"/>
-  <tab id="Currencies" name="Valute"/>
-  <tab id="Taxes" name="Tasse"/>
-  <tab id="Tax_Rules" name="Regimi fiscali"/>
+  <tab id="Customers_1" name="Clienti"/>
+  <tab id="Addresses" name="Indirizzi"/>
+  <tab id="Groups" name="Gruppi"/>
+  <tab id="Shopping_Carts" name="Carrelli shopping"/>
+  <tab id="Customer_Service" name="Servizio clienti"/>
+  <tab id="Contacts" name="Contatti"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
  <tab id="Cart_Rules" name="Voucher"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
+  <tab id="Shipping_1" name="Spedizione"/>
  <tab id="Carriers" name="Corrieri"/>
-  <tab id="States" name="Stati"/>
-  <tab id="Countries" name="Nazioni"/>
-  <tab id="Zones" name="Zone"/>
  <tab id="Price_Ranges" name="Fasce di prezzo"/>
  <tab id="Weight_Ranges" name="Fasce di peso"/>
-  <tab id="Search_Engines" name="Motori di ricerca"/>
-  <tab id="Referrers" name="Referenti"/>
+  <tab id="Localization_1" name="Localizzazione"/>
+  <tab id="Languages" name="Lingue"/>
+  <tab id="Zones" name="Zone"/>
+  <tab id="Countries" name="Nazioni"/>
+  <tab id="States" name="Stati"/>
+  <tab id="Currencies" name="Valute"/>
+  <tab id="Tax_Rules" name="Regimi fiscali"/>
+  <tab id="Taxes" name="Tasse"/>
+  <tab id="Translations" name="Traduzioni"/>
+  <tab id="Modules_1" name="Moduli"/>
  <tab id="Modules_Themes_Catalog" name="Moduli &amp; Temi catalogo"/>
  <tab id="My_Account" name="Il mio Account"/>
-  <tab id="Themes" name="Temi"/>
  <tab id="Positions" name="Posizioni"/>
+  <tab id="Payment" name="Pagamento"/>
+  <tab id="General" name="General"/>
+  <tab id="Orders_2" name="Ordini"/>
+  <tab id="Products_1" name="Prodotti"/>
+  <tab id="Customers_2" name="Clienti"/>
+  <tab id="Themes" name="Temi"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Images" name="Immagine"/>
+  <tab id="Contact_stores" name="Contact &amp; stores"/>
+  <tab id="Search_1" name="Cerca"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Geolocation" name="Geolocalizzazione"/>
+  <tab id="Configuration_Information" name="Informazioni di configurazione"/>
+  <tab id="Performance" name="Performance"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="CSV_Import" name="Importa"/>
+  <tab id="DB_Backup" name="DB backup"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Logs" name="Log"/>
+  <tab id="Subdomains" name="Sottodomini"/>
+  <tab id="Webservice" name="Webservice"/>
+  <tab id="Preferences_1" name="Preferenze"/>
+  <tab id="Quick_Access" name="Accesso rapido"/>
+  <tab id="Employees" name="Impiegati"/>
  <tab id="Profiles" name="Profili"/>
  <tab id="Permissions" name="Permessi"/>
-  <tab id="Contacts" name="Contatti"/>
  <tab id="Tabs" name="Tab"/>
-  <tab id="Customer_Service" name="Servizio clienti"/>
-  <tab id="Contact_Information" name="Informazioni di contatto"/>
-  <tab id="Themes_1" name="Temi"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Products_1" name="Prodotti"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Images" name="Immagine"/>
-  <tab id="Database" name="Database"/>
-  <tab id="Localization" name="Localizzazione"/>
-  <tab id="Search_1" name="Cerca"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="Geolocation" name="Geolocalizzazione"/>
-  <tab id="Languages" name="Lingue"/>
-  <tab id="Translations" name="Traduzioni"/>
-  <tab id="Quick_Access" name="Accesso rapido"/>
-  <tab id="Configuration_Information" name="Informazioni di configurazione"/>
-  <tab id="CSV_Import" name="Importa"/>
-  <tab id="Subdomains" name="Sottodomini"/>
-  <tab id="DB_Backup" name="DB backup"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Generators" name="Generatori"/>
-  <tab id="Stores" name="Negozi"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Stats_1" name="Stat"/>
+  <tab id="Search_Engines" name="Motori di ricerca"/>
+  <tab id="Referrers" name="Referenti"/>
+  <tab id="Accounting_export" name="Accounting export"/>
+  <tab id="Shops_1" name="Shops"/>
  <tab id="Group_Shops" name="Group Shops"/>
  <tab id="Shop_Urls" name="Shop Urls"/>
  <tab id="Warehouses" name="Warehouses"/>
@@ -96,7 +106,4 @@
  <tab id="Stock_cover" name="Stock cover"/>
  <tab id="Supply_orders" name="Supply orders"/>
  <tab id="Configuration" name="Configuration"/>
-  <tab id="Account_Number_Management" name="Account Number Management"/>
-  <tab id="Export" name="Export"/>
-  <tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
 </entity_tab>
@@ -0,0 +1,7 @@
+<?php
+
+class AdminAccountingRegisteredNumberController extends AdminAccountingRegisteredNumberControllerCore
+{
+
+}
+
@@ -0,0 +1,7 @@
+<?php
+
+class AdminAdminPreferencesController extends AdminAdminPreferencesControllerCore
+{
+
+}
+
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAliasesController extends AdminAliasesControllerCore
-{
-
-}
-
@@ -1,7 +0,0 @@
-<?php
-
-class AdminContactController extends AdminContactControllerCore
-{
-
-}
-
@@ -0,0 +1,7 @@
+<?php
+
+class AdminCustomerPreferencesController extends AdminCustomerPreferencesControllerCore
+{
+
+}
+
@@ -1,7 +0,0 @@
-<?php
-
-class AdminDbController extends AdminDbControllerCore
-{
-
-}
-
@@ -1,7 +0,0 @@
-<?php
-
-class AdminGeneratorController extends AdminGeneratorControllerCore
-{
-
-}
-
@@ -0,0 +1,7 @@
+<?php
+
+class AdminMaintenanceController extends AdminMaintenanceControllerCore
+{
+
+}
+
@@ -0,0 +1,7 @@
+<?php
+
+class AdminOrderPreferencesController extends AdminOrderPreferencesControllerCore
+{
+
+}
+
@@ -1,7 +0,0 @@
-<?php
-
-class AdminPdfController extends AdminPdfControllerCore
-{
-
-}
-
@@ -51,6 +51,9 @@ $_LANGADM['AdminAccountingManagement9949d6d5e347ca9d0da84520de395f89'] = 'Config
 $_LANGADM['AdminAccountingManagementa8e0a285de8593b0f978b33fb620179e'] = 'Numéro par défaut pour cette boutique';
 $_LANGADM['AdminAccountingManagementa9e2ceb7315eca5c3974b433f0c540fb'] = 'Les numéros de comptes ont été enregistrés';
 $_LANGADM['AdminAccountingManagementc9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
+$_LANGADM['AdminAccountingRegisteredNumber0f26e4f64d58beb4d924627c707e43ad'] = 'Numéro de compte';
+$_LANGADM['AdminAccountingRegisteredNumber20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom';
+$_LANGADM['AdminAccountingRegisteredNumber8d3f5eff9c40ee315d452392bed5309b'] = 'Nom';
 $_LANGADM['AdminAddresses1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Société';
 $_LANGADM['AdminAddresses20db0bfeecd8fe60533206a2b5e9891a'] = 'Prénom';
 $_LANGADM['AdminAddresses284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses';
@@ -76,20 +79,35 @@ $_LANGADM['AdminAddressesea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
 $_LANGADM['AdminAddressesf64be5eef68442a8f50cf535b92ad3e4'] = 'Pays :';
 $_LANGADM['AdminAddressesf90e807b74928118048a1a6fa65ebfe5'] = 'E-mail du client';
 $_LANGADM['AdminAddressesfe66abce284ec8589e7d791185b5c442'] = 'Téléphone fixe';
-$_LANGADM['AdminAliases01d2aac5d20787a1e873f2bdc79b514a'] = 'Rechercher ce mot à la place.';
-$_LANGADM['AdminAliases09319b10a5e3af8e97dc40523655a283'] = 'Saisir chaque alias séparé par une virgule (\",\") (par ex. : \'prestshop,preztashop,prestasohp\')';
-$_LANGADM['AdminAliases13348442cc6a27032d2b4aa28b75a5d3'] = 'Rechercher';
-$_LANGADM['AdminAliases259b411f284388d228a30c1e2ed0c61d'] = 'Caractères interdits : <>;=#{}';
-$_LANGADM['AdminAliases38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
-$_LANGADM['AdminAliases5aac38deec604d81565722cc5a2a6be1'] = 'Résultat :';
-$_LANGADM['AdminAliases792fd33273f5b3dbbcc6bd5de52b7e20'] = 'n\'est pas un résultat valable';
-$_LANGADM['AdminAliases9ab81f57823f6aeb02362291f23883e6'] = 'Alias';
-$_LANGADM['AdminAliases9d2e974b83d9090b463dbcb2ef32ab51'] = 'n\'est pas un alias valable';
-$_LANGADM['AdminAliasesa1f687d813c4e0c415cb5137fcb156c1'] = 'Alias :';
-$_LANGADM['AdminAliasesa66ec6983e578c3ac4663171b39d168b'] = 'les deux champs sont requis';
-$_LANGADM['AdminAliasesd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
-$_LANGADM['AdminAliasese25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer la sélection ?';
-$_LANGADM['AdminAliasesec53a8c4f07baed5d8825072c89799be'] = 'État';
+$_LANGADM['AdminAdminPreferences051fd283c29527d33402475333dfb1da'] = 'Afficher les notifications lorsque de nouveaux clients vous enverront de nouveaux messages sur votre boutique';
+$_LANGADM['AdminAdminPreferences0db377921f4ce762c62526131097968f'] = 'Général';
+$_LANGADM['AdminAdminPreferences12cbe1a4645659457808631047989afb'] = 'Maximum :';
+$_LANGADM['AdminAdminPreferences1301a51cbee38f0c34369720070e5e1b'] = 'Limite de téléchargement de fichier';
+$_LANGADM['AdminAdminPreferences16c390c0fd1efc4f493a6a861aa22d2f'] = 'Bulles d\'aide du back-office';
+$_LANGADM['AdminAdminPreferences1b1befcb86d487715da458117710dfeb'] = 'Affiche les notifications pour les nouvelles commandes';
+$_LANGADM['AdminAdminPreferences2ca89cca013873c7f841e1acf242b3d6'] = 'Définissez la taille maximale des fichiers joints (en mégaoctets).';
+$_LANGADM['AdminAdminPreferences3aadb5e86b174ecada1174e22f5a6368'] = 'Poids maximum des fichiers joints';
+$_LANGADM['AdminAdminPreferences46f18d3960afc01e5a1a5a0e0e9d571b'] = 'Vérifier automatiquement les mises à jour de modules';
+$_LANGADM['AdminAdminPreferences4e7ff7ca556a7ac8329ab27834e9631b'] = 'Affiche les notifications pour les nouveaux messages';
+$_LANGADM['AdminAdminPreferences5870c50004d9568f8de39d09363533a7'] = 'Limite de téléchargement d\'images';
+$_LANGADM['AdminAdminPreferences656ff9c98ad48192724f8a74f5e18733'] = 'Définit la limite de téléchargement pour un produit. Cette valeur doit être inférieure ou égale à celle de votre serveur';
+$_LANGADM['AdminAdminPreferences686a2ac82a5a64eca870ba9a55b8a675'] = 'De nouveaux modules et mises à jour sont affichés sur la page des modules';
+$_LANGADM['AdminAdminPreferences6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
+$_LANGADM['AdminAdminPreferences6d964e25aa6aa88c8353880e00202cf4'] = 'Indiquez le nombre d\'heures';
+$_LANGADM['AdminAdminPreferences77dcf778f486e4dcbe5b400bd08ac3a6'] = 'mégaoctets';
+$_LANGADM['AdminAdminPreferences8004e61ca76ff500d1e6ee92f7cb7f93'] = 'Affiche les notifications pour les nouveaux clients';
+$_LANGADM['AdminAdminPreferences8cde7b1fa570f328143c41677032b507'] = 'Définit la limite de téléchargement pour une image. Cette valeur doit être inférieure ou égale à celle de votre serveur';
+$_LANGADM['AdminAdminPreferences9cfc2e28ebe44b3e14f9d780d2150650'] = 'Vérifiez l\'adresse IP du cookie afin d\'éviter que votre cookie soit volé';
+$_LANGADM['AdminAdminPreferencesa274f4d4670213a9045ce258c6c56b80'] = 'Notifications';
+$_LANGADM['AdminAdminPreferencesa9fff6d50be898f47a507354626b8b8d'] = 'Masquer les conseils d\'optimisation';
+$_LANGADM['AdminAdminPreferencesade28d54bcdbc7c4cfd45d84ad517f7b'] = 'Quote de téléchargement';
+$_LANGADM['AdminAdminPreferencesae1d865ef6ce7ebb9492ea7a7f1bc8a5'] = 'Afficher les notifications lorsque de nouveaux clients s\'inscriront sur votre boutique';
+$_LANGADM['AdminAdminPreferencesc87330f475e4384552c0077927d26e1a'] = 'Durée de vie du cookie front-office';
+$_LANGADM['AdminAdminPreferencesdc58d598b2b22e50c5af01134305a4fb'] = 'Active l\'aide contextuelle en dessous des champs de saisie';
+$_LANGADM['AdminAdminPreferencese4e2107f99e82247d7e32ac7919c4416'] = 'Masquer les conseils d\'optimisation sur la page d\'accueil du panneau d\'administration';
+$_LANGADM['AdminAdminPreferencese673b146824251548feecf1f3929aceb'] = 'Durée de vie du cookie back-office';
+$_LANGADM['AdminAdminPreferencesed5454727fb14b9800ead242d0972184'] = 'Vérifier l\'IP dans le cookie';
+$_LANGADM['AdminAdminPreferencesf79dc7c8a2b655f2dcae2ad1102b725b'] = 'Afficher les notifications lorsque de nouvelles commandes seront passées sur votre boutique';
 $_LANGADM['AdminAttachments06d43815fa42336629ff54da5630143c'] = 'le fichier';
 $_LANGADM['AdminAttachments06d5d60cedc3946089462c34c719b4d6'] = 'Le fichier n\'existe pas ou celui-ci n\'est pas téléchargeable, vérifiez la limite de taille des fichiers téléchargeables configurée sur votre serveur.';
 $_LANGADM['AdminAttachments0b27918290ff5323bea1e3b78a9cf04e'] = 'Fichier';
@@ -530,23 +548,6 @@ $_LANGADM['AdminCmse6b391a8d2c4d45902a23a8b6585703d'] = 'URL';
 $_LANGADM['AdminCmsef61fb324d729c341ea8ab9901e23566'] = 'Créer';
 $_LANGADM['AdminCmsf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutique associée :';
 $_LANGADM['AdminCmsf8825c9f08ff15b5ef6bc3a3898817e8'] = 'Enregistrer et prévisualiser';
-$_LANGADM['AdminContact0188aaac1db951dc90bced9ecd606c04'] = 'Affichée dans les e-mails envoyés aux clients';
-$_LANGADM['AdminContact0e2fb5b02182fd28b9b96e86ed27838f'] = 'Fax :';
-$_LANGADM['AdminContact18325105de95083e4a1d10b78f29c2bc'] = 'État/région :';
-$_LANGADM['AdminContact237726599268adc200964601cdafeb16'] = 'Adresse e-mail de la boutique :';
-$_LANGADM['AdminContact38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
-$_LANGADM['AdminContact3c720ca57528095461f52d40d26d956a'] = 'Adresse du magasin (ligne 1) :';
-$_LANGADM['AdminContact5dd532f0a63d89c5af0243b74732f63c'] = 'Coordonnées';
-$_LANGADM['AdminContact61f0fa926f97eafb392975ed79cebb4a'] = 'Nom de la boutique :';
-$_LANGADM['AdminContact63406c9482c644975f227cc93788e8fb'] = 'Choisissez votre pays';
-$_LANGADM['AdminContact673ae02fffb72f0fe68a66f096a01347'] = 'Téléphone :';
-$_LANGADM['AdminContact76cee53a1d378b50e5bc3aa50ab3b4c0'] = 'Immatriculation de la boutique (ex. : SIRET, RCS, ...)';
-$_LANGADM['AdminContact792ccc0c7f3d0d20366fbbf44ef7cd78'] = 'Affiché dans les en-têtes des pages et des e-mails';
-$_LANGADM['AdminContactbffb711ec36f280459d11dce315da72f'] = 'Ville :';
-$_LANGADM['AdminContactd7ceaa3ddb4fc6884046456463ecb258'] = 'Immatriculation :';
-$_LANGADM['AdminContacte0ef7a9e00e6b6189c8da23da3fe79f8'] = 'Code postal :';
-$_LANGADM['AdminContactf64be5eef68442a8f50cf535b92ad3e4'] = 'Pays :';
-$_LANGADM['AdminContactffea2d321be109fc7243cfeb515fe257'] = 'Choisissez votre état/région (si cela s\'applique)';
 $_LANGADM['AdminContacts00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminContacts0a958d0b68cae1805a8f64cdcddb821b'] = 'Informations complémentaires au sujet de ce contact';
 $_LANGADM['AdminContacts38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
@@ -683,13 +684,11 @@ $_LANGADM['AdminCountriesa314046def218cebb078f190756b0a4a'] = 'Format de l\'adre
 $_LANGADM['AdminCountriesa4f164d8b1b72c87b8ce558827bcd423'] = 'Devise par défaut de la boutique';
 $_LANGADM['AdminCountriesa86a021f16a103f44a8aa1c06e484831'] = 'Affichera une mise en page par défaut pour ce pays';
 $_LANGADM['AdminCountriesad68f9bafd9bf2dcf3865dac55662fd5'] = 'Code ISO';
-$_LANGADM['AdminCountriesb017db41a29dff4007de058af406341e'] = 'Pays par défaut utilisé dans la boutique';
 $_LANGADM['AdminCountriesb3ff996fe5c77610359114835baf9b38'] = 'Zone';
 $_LANGADM['AdminCountriesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminCountriesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminCountriesbafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
 $_LANGADM['AdminCountriescef82d41923398076fb06d463541d707'] = 'Contient des états/régions :';
-$_LANGADM['AdminCountriesd14d3384847c11b0708990b3343c8dbf'] = 'Pays par défaut :';
 $_LANGADM['AdminCountriesd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
 $_LANGADM['AdminCountriesd3c5d8339f3840b75b4031c2b1e508de'] = 'Liste officielle ici';
 $_LANGADM['AdminCountriesd88def0eb4ff593621b4113e1fc54965'] = 'Utiliser la dernière mise en page enregistrer';
@@ -711,7 +710,6 @@ $_LANGADM['AdminCurrencies260f0e6ff1df0aa4f39310176b5d6c44'] = 'Placez cette URL
 $_LANGADM['AdminCurrencies29e59767fa0a8d3adbacc87cae6d061c'] = 'Symbole :';
 $_LANGADM['AdminCurrencies2e5845557ed8ecd864f0db5ce4dac829'] = 'Apparaitra sur le front-office, par exemple : euro, dollar';
 $_LANGADM['AdminCurrencies32dd182c91d1a647c40ce4561eb33da9'] = 'Apparaitra sur le front-office, exemple : €, $';
-$_LANGADM['AdminCurrencies36144ac2644548932977cc36677c1698'] = 'Devise par défaut utilisée dans la boutique';
 $_LANGADM['AdminCurrencies386c339d37e737a436499d423a77df0c'] = 'Devise';
 $_LANGADM['AdminCurrencies38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminCurrencies3af4c1797da60fd50670ddbb669fc0aa'] = 'Code ISO :';
@@ -729,15 +727,12 @@ $_LANGADM['AdminCurrencies8632ac58071857c4425a9b6042f1fe21'] = 'Code ISO, ex. :
 $_LANGADM['AdminCurrencies876ca43ba50351d4e492970f40632661'] = 'Mettre à jour les taux de change';
 $_LANGADM['AdminCurrencies87bd3cbac63d9410fff1815181cb60cc'] = 'Espace :';
 $_LANGADM['AdminCurrencies88ddc0e9e26e200dccfdf7a3a1274b98'] = 'Taux de conversion d\'une unité de la devise par défaut (par exemple 1 €) vers cette devise. Par exemple, si la devise par défaut est l\'euro et que celle-ci est le dollar, saisissez \"1.20\"';
-$_LANGADM['AdminCurrencies8e10808175a8d945d13bab31fb2e2663'] = 'Devise par défaut:';
 $_LANGADM['AdminCurrenciesa5ffda8871e3d3d193c8e67f76686375'] = 'Seuls les lettres et le tiret sont autorisés';
 $_LANGADM['AdminCurrenciesaa3606501de88ea50155297736664490'] = 'en euros';
 $_LANGADM['AdminCurrenciesad68f9bafd9bf2dcf3865dac55662fd5'] = 'Code ISO';
-$_LANGADM['AdminCurrenciesb67536699de7bf5ddd53bd913e87758a'] = 'Préférences devises';
 $_LANGADM['AdminCurrenciesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminCurrenciesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminCurrenciesbebbab2c1ac732ccef4181f51ed52967'] = 'Taux de conversion :';
-$_LANGADM['AdminCurrenciescc2f0a18cb0448ca2101f93be765e487'] = 'Si vous changez la monnaie par défaut, vous devrez modifier manuellement le prix de chaque produit.';
 $_LANGADM['AdminCurrenciesd311128c6b9f34f85e6b0e29bcbcd165'] = 'Taux de change';
 $_LANGADM['AdminCurrenciesd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
 $_LANGADM['AdminCurrenciesd6b378c31ecfd51965a5a318e06af249'] = 'Inclus une espace entre le signe et le prix, ex. :';
@@ -746,6 +741,19 @@ $_LANGADM['AdminCurrenciese02162e8fe1c036639e5c8850ce44b3f'] = 'Décimales :';
 $_LANGADM['AdminCurrenciese25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?';
 $_LANGADM['AdminCurrenciese7e915ec26ac2be5f5730752e5fc3b78'] = 'Vous ne pouvez pas désactiver la devise par défaut';
 $_LANGADM['AdminCurrenciesf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutique associée :';
+$_LANGADM['AdminCustomerPreferences0db377921f4ce762c62526131097968f'] = 'Général';
+$_LANGADM['AdminCustomerPreferences3009d174d7831e0445125204c567d195'] = 'Active ou désactive le mode B2B. Lorsque cette option est active, plusieurs fonctionnalités B2B deviennent disponibles.';
+$_LANGADM['AdminCustomerPreferences38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
+$_LANGADM['AdminCustomerPreferences47ff1aadf05084936c5c2465c796048d'] = 'L\'option \"Création de compte seulement\" permet au client de s\'enregistrer plus vite et de n\'enregistrer son adresse que plus tard.';
+$_LANGADM['AdminCustomerPreferences640fd0cc0ffa0316ae087652871f4486'] = 'minutes';
+$_LANGADM['AdminCustomerPreferences6d1b3d500b8a7cbaeb62b0643ee57c7c'] = 'Regénération du mot de passe :';
+$_LANGADM['AdminCustomerPreferences87eed0b2fbd8bec6796514f309d87aec'] = 'Temps minimum avant de redemander un nouveau mot de passe';
+$_LANGADM['AdminCustomerPreferences8d7a93422a7ecd89d12811e22055f6d5'] = 'Récupération du panier après l\'authentification du client';
+$_LANGADM['AdminCustomerPreferences9f7a304fd501ed0e4d06b899fed739d0'] = 'Création de compte seulement';
+$_LANGADM['AdminCustomerPreferencesbcb9adf1d2347258b5c65483e34cf86f'] = 'Type de processus d\'enregistrement';
+$_LANGADM['AdminCustomerPreferencesc760118c537146713521758269a44bd3'] = 'Activer le mode B2B';
+$_LANGADM['AdminCustomerPreferencese6b03a6bdf49d1cd0655e0f7a3d990cb'] = 'Réafficher le panier après identification';
+$_LANGADM['AdminCustomerPreferencesf2c822352f0e0a62e2de6d716475911b'] = 'Standard (création de compte et d\'adresse)';
 $_LANGADM['AdminCustomerThreads018d4d01cba3905ad11258518b4ea424'] = 'Envoyé par';
 $_LANGADM['AdminCustomerThreads03f4a47830f97377a35321051685071e'] = 'Terminé';
 $_LANGADM['AdminCustomerThreads068f62c804cc9c4cd4f6dfc5b5d3ecaa'] = 'Sujets en attente';
@@ -880,6 +888,7 @@ $_LANGADM['AdminCustomers46a2a41cc6e552044816a2d04634545d'] = 'État';
 $_LANGADM['AdminCustomers49ee3087348e8d44e1feda1917443987'] = 'Nom';
 $_LANGADM['AdminCustomers4c2a8fe7eaf24721cc7a9f0175115bd4'] = 'Message';
 $_LANGADM['AdminCustomers4e140ba723a03baa6948340bf90e2ef6'] = 'Nom :';
+$_LANGADM['AdminCustomers4e60715d561de124c1bf3cfdd875cf59'] = 'Utilisé pour l\'exportation de comptabilité';
 $_LANGADM['AdminCustomers5023c5f31815e34f79900c0ea627d7d6'] = 'Aucun panier disponible';
 $_LANGADM['AdminCustomers56eec78925570b01dc23134175172985'] = 'Votre note a été enregistrée';
 $_LANGADM['AdminCustomers59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
@@ -887,12 +896,9 @@ $_LANGADM['AdminCustomers5b8c99dad1893a85076709b2d3c2d2d0'] = 'Adresse IP';
 $_LANGADM['AdminCustomers5e5f0a863cd129317037e3def37b4097'] = 'Société :';
 $_LANGADM['AdminCustomers5ed5ce582affef97f07fa474c6751302'] = 'Client acceptant de recevoir des publicités';
 $_LANGADM['AdminCustomers6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Caractères non valides :';
-$_LANGADM['AdminCustomers640fd0cc0ffa0316ae087652871f4486'] = 'minutes';
 $_LANGADM['AdminCustomers668a8d8d7ffe5da112b266e46b79b685'] = 'Prénom :';
 $_LANGADM['AdminCustomers694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité';
-$_LANGADM['AdminCustomers6d1b3d500b8a7cbaeb62b0643ee57c7c'] = 'Regénération du mot de passe :';
 $_LANGADM['AdminCustomers6d2e7477916d118eb0a377fd13af4f63'] = 'Dernière mise à jour :';
-$_LANGADM['AdminCustomers6dc6993c567c112a42b193c430f9ec43'] = 'Options clients';
 $_LANGADM['AdminCustomers6ff01ff52bb6bc600dcb062808a55c5f'] = 'ne possède aucun bon de réduction';
 $_LANGADM['AdminCustomers7137a85d9b8d9e6d09f47767d2ca31ee'] = 'APE :';
 $_LANGADM['AdminCustomers7442e29d7d53e549b78d93c46b8cdcfc'] = 'Commandes';
@@ -904,7 +910,6 @@ $_LANGADM['AdminCustomers7b4d23148ad2c2f32f217ae0640a375c'] = 'Vous disposez de
 $_LANGADM['AdminCustomers7c02e576ed6029a3a1d64700cc43ebf7'] = 'Je veux complètement supprimer mon ou mes client(s), toutes les données seront supprimées de la base de données. Un client avec la même adresses e-mail pourra se réinscrire.';
 $_LANGADM['AdminCustomers80e915c39ca9254655d2802979aa698b'] = 'Transformer en compte client';
 $_LANGADM['AdminCustomers81fe7d0c685ca9f1829f5ff52370d06e'] = 'Un compte client existe déjà avec la même adresse e-mail';
-$_LANGADM['AdminCustomers87eed0b2fbd8bec6796514f309d87aec'] = 'Temps minimum avant de redemander un nouveau mot de passe';
 $_LANGADM['AdminCustomers8b5dd64ab8d0b8158906796b53a200e2'] = 'Adresse e-mail';
 $_LANGADM['AdminCustomers8d177b48ffca1fb18c3bfd1e8c0eb645'] = 'Groupe par défaut :';
 $_LANGADM['AdminCustomers8d218b952c9ef571cd270aaef8f849d1'] = 'Autoriser ou non ce client à se connecter';
@@ -959,23 +964,8 @@ $_LANGADM['AdminCustomersf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
 $_LANGADM['AdminCustomersf81f334947c006163040911e694fc3ec'] = 'Erreur : votre note n\'est pas valide';
 $_LANGADM['AdminCustomersfc26e55e0993a75e892175deb02aae15'] = 'Paniers';
 $_LANGADM['AdminCustomersff398a1c3434e160c655aa1613e0eace'] = 'Affiliés';
-$_LANGADM['AdminDb006e7be42e56d810865222669c716f9e'] = 'Base de données :';
-$_LANGADM['AdminDb38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
-$_LANGADM['AdminDb3f783e6afc73242779dde81c7825def0'] = 'Laisser vide si aucun changement';
-$_LANGADM['AdminDb505de52d5ae227b6e8acb02dce2a0c4d'] = 'Serveur :';
 $_LANGADM['AdminDb51c45b795d5d18a3e4e0c37e8b20a141'] = 'Table';
-$_LANGADM['AdminDb5ff9df198222a96f26bf2cb279d83bd8'] = 'Utilisateur :';
-$_LANGADM['AdminDb67cfd6717606cadb04e8ae03082a0182'] = 'IP ou nom du serveur ; \"localhost\" fonctionnera dans la plupart des cas';
-$_LANGADM['AdminDb6bb09f0abb00bcba314068abab6fecb7'] = 'est déjà présent dans';
-$_LANGADM['AdminDb6c1375701d87f2636b01cf951d0a375b'] = 'Moteur MySQL';
-$_LANGADM['AdminDb9222f8688de5dfd4dabc06fffe8c6aa0'] = 'Nom de la base de données (ex. : \"prestashop\")';
-$_LANGADM['AdminDba7fd7e3f904a981a4952454d79a806e8'] = 'Impossible de changer de moteur pour';
-$_LANGADM['AdminDbac7484fa4e36b9b26ceb27526ee7268f'] = 'Changer le moteur en';
 $_LANGADM['AdminDbb0d1963f24d64313f9c8d83662cc551a'] = 'Moteur de la table';
-$_LANGADM['AdminDbb341a59d5636ed3d6a819137495b08a0'] = 'Mot de passe :';
-$_LANGADM['AdminDbb833598a404d0408f61b9762278c9bea'] = 'Soyez TRÈS PRUDENT avec ces réglages, car des changements peuvent causer des dysfonctionnements pour votre boutique PrestaShop en ligne. Pour toute question, consultez le fichier config/settings.inc.php.';
-$_LANGADM['AdminDbe307db07b3975fef922a80d07455ee5e'] = 'Base de données';
-$_LANGADM['AdminDbf72ba2e5f0388494cc5041adad99581f'] = 'Préfixe :';
 $_LANGADM['AdminDeliverySlip067af5895a7ced3197520b591f9a41eb'] = 'Générer un fichier PDF';
 $_LANGADM['AdminDeliverySlip071e16ef4a5515728cc97ed028d85711'] = 'Le prochain bon de livraison commencera à ce numéro, qui augmentera à chaque nouveau bon';
 $_LANGADM['AdminDeliverySlip0b1fb1278454d848f968d419e29c253b'] = 'Format : 2007-12-31 (inclus)';
@@ -1123,7 +1113,6 @@ $_LANGADM['AdminGenerator7959e21ff0b83542251ca0b4e9a62eea'] = 'Générer le fich
 $_LANGADM['AdminGenerator7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'N\'activez cette option que si vous rencontrez des problèmes avec la redirection d\'URL de certaines pages.';
 $_LANGADM['AdminGenerator8052c42ab3b8aa06a3f5f788a4ddccc2'] = 'fichier .htaccess';
 $_LANGADM['AdminGenerator93f711fc90428ec9589a70706e1866a2'] = 'vide dans le dossier';
-$_LANGADM['AdminGenerator99bd735570f4e71f3596ad208f6f63c6'] = 'Impossible d\'écrire dans le fichier :';
 $_LANGADM['AdminGeneratoraa2646a667ee1cd83235786dccef4a26'] = 'robots.txt';
 $_LANGADM['AdminGeneratoracaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Désactiver l\'option Apache MultiViews';
 $_LANGADM['AdminGeneratorad11acdc8759d7a20ca3b868a8db30ae'] = 'Génération du fichier .htaccess';
@@ -1132,7 +1121,6 @@ $_LANGADM['AdminGeneratorb696dfaf5a833f70d71d26d052c6eaa3'] = 'Générer le fich
 $_LANGADM['AdminGeneratorb8a27e47e64caa3e36c8894c3745357b'] = 'Avant de pouvoir utiliser cet outil, vous devez :';
 $_LANGADM['AdminGeneratorc03c063bb390b0042cabd4e08ac92347'] = 'vide dans le dossier :';
 $_LANGADM['AdminGeneratord443c06bc05c5f7d35d95aba3ddcf817'] = '- créer un';
-$_LANGADM['AdminGeneratorff75496593d3ce1584f5e974e9668330'] = 'Veuillez vérifier les permissions d\'écriture.';
 $_LANGADM['AdminGeneratorffd4c6a67eb0c56d04a5ebca5e8cbf80'] = 'Générer le fichier robots.txt en cliquant sur le bouton suivant :';
 $_LANGADM['AdminGeolocation2eef60563335b16d4a98900298fe7841'] = 'Comportement de la géolocalisation pour les pays restreints :';
 $_LANGADM['AdminGeolocation38e8888ae62868f7ec6cc940ffcaf373'] = 'Comportement de la géolocalisation pour les pays non-reconnus :';
@@ -1297,6 +1285,8 @@ $_LANGADM['AdminHomeecd188c0a9e0913f062d22331411158a'] = 'Réécriture d\'URL';
 $_LANGADM['AdminHomef38cdb09e367da8fd9272ab1efd8a14e'] = 'Vous êtes actuellement connecté avec le nom de domaine suivant :';
 $_LANGADM['AdminHomefea7905b2c719313e6d3825b97fd1577'] = 'Nouvelle règle de prix pour le catalogue';
 $_LANGADM['AdminImages00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
+$_LANGADM['AdminImages044a77653804fe33652d68098d98121e'] = 'Utiliser l\'ancien système de stockage d\'images';
+$_LANGADM['AdminImages048a517fd1781ed314402df592f2ea68'] = 'Largeur image produit :';
 $_LANGADM['AdminImages068f80c7519d0528fb08e82137a72131'] = 'Produits';
 $_LANGADM['AdminImages09c4e57a34a4ee6ad5edd96be95e3998'] = 'Ce type sera appliqué aux images des marques';
 $_LANGADM['AdminImages0be9bdbde253c5d649e8667c0bae6754'] = 'PrestaShop utilise un nouveau système de stockage des images produits. Ce système offre de meilleures performances si votre boutique a un très grand nombre de produits.';
@@ -1310,12 +1300,14 @@ $_LANGADM['AdminImages2377be3c2ad9b435ba277a73f0f1ca76'] = 'Marques';
 $_LANGADM['AdminImages258606ef5a3ed5cd7e39da08435adec0'] = 'Regénérer les miniatures';
 $_LANGADM['AdminImages2a911eb0d71d1b707a3f9d722a5935c2'] = 'Utiliser le JPEG';
 $_LANGADM['AdminImages2c1bbb0a5ff08c8011d6ea83084277ff'] = 'Va de 9 (plus faible qualité, petite taille de fichier) à 0 (meilleure qualité, taille du fichier importante)';
+$_LANGADM['AdminImages32465c25dfecca0db61214b9af3bd9f1'] = 'Taille maximum des images des produits :';
 $_LANGADM['AdminImages32954654ac8fe66a1d09be19001de2d4'] = 'Largeur';
 $_LANGADM['AdminImages38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminImages3c9e0f95a0c3f7dd4c650d3ed1a0afb5'] = 'Ce type sera appliqué aux images de fournisseurs';
 $_LANGADM['AdminImages42ceb344b0aaf896b362b0db70b46f98'] = 'Qualité d\'image';
 $_LANGADM['AdminImages48ccf48dcf2218a413ce473262f21a0c'] = 'Largeur :';
 $_LANGADM['AdminImages49ee3087348e8d44e1feda1917443987'] = 'Nom';
+$_LANGADM['AdminImages4b3a6218bb3e3a7303e8a171a60fcf92'] = 'octets';
 $_LANGADM['AdminImages5e869c034d4bd6df7f278053e786e4fb'] = 'Des images dupliquées ont été trouvées pendant le déplacement des images. Ceci est probablement causé par les images de démonstration de PrestaShop. Veuillez vérifier que le dossier';
 $_LANGADM['AdminImages66a3f886eb548f3575add71847622388'] = 'Attention ! Les miniatures générées manuellement seront automatiquement remplacées par la génération automatique.';
 $_LANGADM['AdminImages6713e1295572974656e3e04d18e77ca9'] = 'PrestaShop a détecté que votre configuration serveur n\'est pas compatible avec le nouveau système de stockage d\'images (la directive \"safe_mode\" est activée). Vous devriez continuer à utiliser le système actuel.';
@@ -1329,10 +1321,13 @@ $_LANGADM['AdminImages821b8ee6937cec96c30fdafbfe836d68'] = 'Magasins';
 $_LANGADM['AdminImages874d3deed67e503cac1d8bc00417794a'] = 'Déplacer les images';
 $_LANGADM['AdminImages8c38776925f7cf41c090646a43157024'] = 'Catégories :';
 $_LANGADM['AdminImages9310244aa3f5325c976135a2a089949b'] = 'Le processus peut prendre de quelques minutes à plus d\'une heure, merci pour votre patience';
+$_LANGADM['AdminImages9a61f5ce3180789a8455f536681cabc1'] = 'Hauteur image produit :';
+$_LANGADM['AdminImages9df22f196a33acd0b372fe502de51211'] = 'auto';
 $_LANGADM['AdminImagesa00e46e856e637f8fd077b4fd710c9e2'] = 'Fournisseurs :';
 $_LANGADM['AdminImagesa11abdf9fb207f44c2d44c72d8a1203f'] = 'Lettres uniquement (ex. : small, large...)';
 $_LANGADM['AdminImagesaf1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
 $_LANGADM['AdminImagesb1c94ca2fbc3e78fc30069c8d0f01680'] = 'Toutes';
+$_LANGADM['AdminImagesb435e227d5dd201e1768b2bcb2e0aa81'] = 'hauteur';
 $_LANGADM['AdminImagesb51000000ff730e7cacd10980186c1a4'] = 'Sélectionner l\'image';
 $_LANGADM['AdminImagesb52b44c9d23e141b067d7e83b44bb556'] = 'Produits :';
 $_LANGADM['AdminImagesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
@@ -1340,16 +1335,23 @@ $_LANGADM['AdminImagesb73770b303fc0f331eee23ad7add197c'] = 'Va de 0 (plus faible
 $_LANGADM['AdminImagesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminImagesbb34f602e45a9fbcb2cdfee7a48673fc'] = 'Scènes';
 $_LANGADM['AdminImagesc2fc3eea4a3f9c52e7acbdb113b171b7'] = 'Largeur maximale en pixels';
+$_LANGADM['AdminImagesc4d833424eba2cd43c9327d4943dc61f'] = 'Image générée par :';
 $_LANGADM['AdminImagesc5e26b2211d5ecbbeac96ea6e1cbb7c2'] = 'Qualité PNG';
+$_LANGADM['AdminImagesc9c4e9c1a92d9b15e0cdefc7ddb1bbd5'] = 'La largeur maximum des images envoyées par les clients (en pixels)';
 $_LANGADM['AdminImagescb2f901ceed5c3365d056794a1b5047f'] = 'Si vous faites une modification, n\'oubliez pas de regénérer les images';
 $_LANGADM['AdminImagescdef01006777c47ccb3e7922b50a9a4c'] = 'Ce type sera appliqué aux images des catégories';
 $_LANGADM['AdminImagescf40e19ee10782c4284cac90feb4f73e'] = 'Hauteur maximale en pixels';
+$_LANGADM['AdminImagescf9694d1337719003737cc35e3c31eb9'] = 'Images produit';
 $_LANGADM['AdminImagesd379cadd41b68efe7c945b4d85c72085'] = 'Effacer les images précédentes';
 $_LANGADM['AdminImagesd46bafd645c490bd4be22c4226619db9'] = 'Qualité JPEG';
 $_LANGADM['AdminImagesd72f2c002b37407379420bf987bca76a'] = 'Ce type sera appliqué aux images des scènes';
+$_LANGADM['AdminImagesdde6c96bcb0af50f18f37572267d904a'] = 'La hauteur maximum des images envoyées par les clients (en pixels)';
 $_LANGADM['AdminImagese4bb324f29622b389af104bce1db6fdc'] = 'Regénère les miniatures pour tous les produits et catégories';
+$_LANGADM['AdminImagese57fbdf001b4b35e6ca7dcdc628ca853'] = 'La taille maximum des images envoyées par les clients (en octets)';
 $_LANGADM['AdminImagese686877843ac3c9f4c45aaea265fe59c'] = 'Préférences > Produits';
+$_LANGADM['AdminImagese7ed00268dc16aecaac5a60aeb6f4c73'] = 'Ce réglage doit rester sur \"Oui\" à moins que vous n’ayez déplacé avec succès les images dans l\'onglet Préférences, sous-onglet Images';
 $_LANGADM['AdminImagese933dc24fb245d863a43b4fefe9b45f5'] = 'Hauteur :';
+$_LANGADM['AdminImageseaae26a6fb20ed3ef54fb23bfa0b1fcc'] = 'largeur';
 $_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Ne décochez cette case que si le traitement a été interrompu et que vous souhaitez le reprendre.';
 $_LANGADM['AdminImageseec6c4bdbd339edf8cbea68becb85244'] = 'Hauteur';
 $_LANGADM['AdminImagesf520fc2ea7f469193c55bc499753a923'] = 'Utiliser le PNG uniquement si l\'image de base est au format PNG';
@@ -1546,6 +1548,7 @@ $_LANGADM['AdminInformation0be76c14451b87542668bec6a03f102d'] = 'Informations à
 $_LANGADM['AdminInformation15f4c82d7b2b43e31c30dd018b800c56'] = 'Paramètres requis';
 $_LANGADM['AdminInformation228dca6dcabbdec3227758a121d003f4'] = 'Activez la bibliothèque GD sur votre serveur';
 $_LANGADM['AdminInformation24bdb129e9fe3a110466ea68fec1d430'] = 'Activez la compression GZip';
+$_LANGADM['AdminInformation2933fa807adda5cc00e163479de35538'] = 'Informations sur la base de données';
 $_LANGADM['AdminInformation2a3ff2643b520b827a90e28d94132d42'] = 'Définir les droits d\'écriture sur le fichier sitemap.xml';
 $_LANGADM['AdminInformation2e62fff336f9fdfefe4f87168f223f8b'] = 'Des changements sur vos fichiers ont été détectés';
 $_LANGADM['AdminInformation3685800496ee1d4fd5cc25d805589f0e'] = 'Méthode d\'envoi de mail';
@@ -1556,12 +1559,14 @@ $_LANGADM['AdminInformation3ff44d56eb2bfbb8f0903e99a28a0819'] = 'Informations su
 $_LANGADM['AdminInformation4c663c632162a23d0f65510f7064aa87'] = 'Définir les droits d\'écriture sur le dossier /config/';
 $_LANGADM['AdminInformation60aaf44d4b562252c04db7f98497e9aa'] = 'Port';
 $_LANGADM['AdminInformation6991d2d7bca0854d11c9d0c92c63142a'] = 'le dossier /lang/ et ses sous-dossiers en récursif';
+$_LANGADM['AdminInformation6c1375701d87f2636b01cf951d0a375b'] = 'Moteur MySQL';
 $_LANGADM['AdminInformation724d606e1653113be000dc4079074e86'] = 'Informations vous concernant';
 $_LANGADM['AdminInformation768648b98e03adaf128f072119af31d3'] = 'Version de PrestaShop';
 $_LANGADM['AdminInformation77d1a005b31f2fcdce1fcdac2a337c42'] = 'Définir les droits d\'écriture en récursif sur le dossier /mails/';
 $_LANGADM['AdminInformation7bb1734784c970616ce5f3a4814dadd6'] = 'Définir les droits d\'écriture sur le dossier /cache/';
 $_LANGADM['AdminInformation7d30d49dcf91d103c59496aafc4e3187'] = 'Informations sur votre serveur';
 $_LANGADM['AdminInformation8746097684bc64be8b7eff424c4debdb'] = 'Vos informations';
+$_LANGADM['AdminInformation8eb2ccdf1b2566fb1ce7fe1545dadbe1'] = 'Préfixe des tables';
 $_LANGADM['AdminInformation93405bfa9b7b11e81895230d1ebff2f5'] = 'Définir les droits d\'écriture en récursif sur le dossier /translations/';
 $_LANGADM['AdminInformation9a7d9391be763fe9cb3985176076d8c8'] = 'Activez le support de MySQL sur votre serveur';
 $_LANGADM['AdminInformation9e987a2c638032d7659ec58e58ef3626'] = 'Définissez l\'option PHP \"register_global\" à \"Off\"';
@@ -1647,18 +1652,15 @@ $_LANGADM['AdminLanguages4e140ba723a03baa6948340bf90e2ef6'] = 'Nom :';
 $_LANGADM['AdminLanguages534fd46732986cba0efeda8701592427'] = 'Format de date';
 $_LANGADM['AdminLanguages581e03e07411d053e8c0f275f90fcabc'] = 'Mettre en ligne un drapeau de pays depuis de votre ordinateur';
 $_LANGADM['AdminLanguages62f569dd8ef1d1651d8a73731788f99e'] = 'Un pack de langue est disponible pour ce code ISO (son nom est';
-$_LANGADM['AdminLanguages6b61093b5fc4585833f0981390993490'] = 'La langue par défaut utilisée dans la boutique';
 $_LANGADM['AdminLanguages6b6a046a46f8e97af0b9e92ccfda7801'] = 'vous ne pouvez pas effacer la langue par défaut';
 $_LANGADM['AdminLanguages6b7af0b6d91545318696c648d6b466ac'] = 'Code ISO sur 2 lettres (ex. : fr, en, de)';
 $_LANGADM['AdminLanguages6ca38c60dc2544d36428b74669fd9f56'] = 'Fichiers d\'e-mail :';
 $_LANGADM['AdminLanguages6ed8662bd9b7b3f59b193010be0c0f4a'] = 'Vérifie si un pack de langue est disponible pour ce code ISO...';
 $_LANGADM['AdminLanguages70212b3d97d23361e0ec0bc567d7ea30'] = 'Image \"Aucune image\" :';
-$_LANGADM['AdminLanguages7c89197a7b81992ee832cb5a89fa6d9d'] = 'Langue par défaut :';
 $_LANGADM['AdminLanguages801ab24683a4a8c433c6eb40c48bcd9d'] = 'Télécharger';
 $_LANGADM['AdminLanguages886815cb03a02e29a28906c196292ba0'] = '(expérimental : votre thème doit être compatible avec ce type de langue)';
 $_LANGADM['AdminLanguages8bc0a3b0cb05ff731e0fb30f35264898'] = 'Code langue complet (ex. : en-us, pt-br)';
 $_LANGADM['AdminLanguages8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo';
-$_LANGADM['AdminLanguages950baf75b9fd48b9cb4a3d30ffeda4ef'] = 'Options des langues';
 $_LANGADM['AdminLanguages9d03b9a48a9f2f06a9698d1f9484011b'] = 'Format de date, court (par exemple, Y-m-d, d/m/Y)';
 $_LANGADM['AdminLanguagesa2bc582c21c4b24f18a32d703c0a109b'] = 'Vous ne pouvez pas supprimer la langue anglaise car elle est nécessaire au fonctionnement du système, vous pouvez seulement la désactiver.';
 $_LANGADM['AdminLanguagesad68f9bafd9bf2dcf3865dac55662fd5'] = 'Code ISO';
@@ -1682,6 +1684,8 @@ $_LANGADM['AdminLanguagese6ced2c612d5024c1a2331cdf96e1c33'] = 'À activer si cet
 $_LANGADM['AdminLanguagesf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutique associée :';
 $_LANGADM['AdminLocalization19edfe6dfa17c2bded4b8112c2b273c0'] = 'La langue de votre serveur.';
 $_LANGADM['AdminLocalization1a8940a8dec839073dae5489faff67f7'] = 'Unité de poids :';
+$_LANGADM['AdminLocalization254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_LANGADM['AdminLocalization36144ac2644548932977cc36677c1698'] = 'Devise par défaut utilisée dans la boutique';
 $_LANGADM['AdminLocalization369686331c93d55e587441143ccdf427'] = 'Localisation';
 $_LANGADM['AdminLocalization38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminLocalization3a08e2e340ab29fd9263af48193cbf8e'] = 'Langues';
@@ -1691,15 +1695,22 @@ $_LANGADM['AdminLocalization5ca775ace4d40c1708b816f404fb3b1c'] = 'Pays locale :'
 $_LANGADM['AdminLocalization659c95668841b7d6602ead454b28d4ba'] = 'L\'unité de poids de votre boutique (ex. : kg ou lbs)';
 $_LANGADM['AdminLocalization67074a462da1e5a1f733c6fb8e2355f3'] = 'Import de pack de localisation';
 $_LANGADM['AdminLocalization6ae75b98f6c60f529bb7426e89216a37'] = 'Importer';
+$_LANGADM['AdminLocalization6b61093b5fc4585833f0981390993490'] = 'La langue par défaut utilisée dans la boutique';
 $_LANGADM['AdminLocalization719fec04166d6fa75f89cd29ad61fa8c'] = 'Taxes';
 $_LANGADM['AdminLocalization763441fe3cb9c82d0ffa63a7c5892b61'] = 'L\'unité de distance de votre boutique (ex. : km ou mi)';
+$_LANGADM['AdminLocalization7c89197a7b81992ee832cb5a89fa6d9d'] = 'Langue par défaut :';
 $_LANGADM['AdminLocalization7ca0e455445740b47853fe270fe966e2'] = 'Impossible de se connecter à prestashop.com';
 $_LANGADM['AdminLocalization8905c859634dd24f740ecd3779cff1be'] = 'Le pays de votre serveur.';
 $_LANGADM['AdminLocalization8b1b3046eb5036b08a5eda7dbaa371cd'] = 'Pack de localisation que vous souhaitez importer :';
+$_LANGADM['AdminLocalization8e10808175a8d945d13bab31fb2e2663'] = 'Devise par défaut:';
 $_LANGADM['AdminLocalization9b6545e4cea9b4ad4979d41bb9170e2b'] = 'Avancé';
 $_LANGADM['AdminLocalizationa44d74a22a9161292ed48e7e08214a92'] = 'Unité de volume :';
 $_LANGADM['AdminLocalizationafe1985cd4e5e0e87e3a7b33c9fe0a5e'] = 'Unités (ex. : poids, volume, distance)';
+$_LANGADM['AdminLocalizationb017db41a29dff4007de058af406341e'] = 'Pays par défaut utilisé dans la boutique';
 $_LANGADM['AdminLocalizationb8464cdd84b5f068ad72bf5c4f32163d'] = 'États';
+$_LANGADM['AdminLocalizationcc2f0a18cb0448ca2101f93be765e487'] = 'Si vous changez la monnaie par défaut, vous devrez modifier manuellement le prix de chaque produit.';
+$_LANGADM['AdminLocalizationd14d3384847c11b0708990b3343c8dbf'] = 'Pays par défaut :';
+$_LANGADM['AdminLocalizationd5bc5fd307b108537039b6b6f98889d5'] = 'Fuseau horaire :';
 $_LANGADM['AdminLocalizationdfcfc43722eef1eab1e4a12e50a068b1'] = 'Devises';
 $_LANGADM['AdminLocalizatione8fa60f47938a6d0c897198af8804338'] = 'L\'unité de volume de votre boutique';
 $_LANGADM['AdminLocalizationeedffe39822101d8aaeaf3b1a1661926'] = 'Contenu à importer :';
@@ -1741,6 +1752,12 @@ $_LANGADM['AdminLogsd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélectio
 $_LANGADM['AdminLogsd95fc016a6eee828f434ed5f55504427'] = 'ID de l\'objet';
 $_LANGADM['AdminLogse25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?';
 $_LANGADM['AdminLogsecb833e2dc5d6c03d4d0cddf1b15e85a'] = 'Gravité (1-4)';
+$_LANGADM['AdminMaintenance049104cffa3c1841dece50e6e41f749c'] = 'Activez ou désactivez votre boutique. Désactivez votre boutique pendant que vous effectuez la maintenance. Veuillez noter que le webservice ne sera pas désactivé pour autant et que vos données seront toujours accessibles par ce biais.';
+$_LANGADM['AdminMaintenance0db377921f4ce762c62526131097968f'] = 'Général';
+$_LANGADM['AdminMaintenance38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
+$_LANGADM['AdminMaintenance7fe15a347d66e291d7a1375273226205'] = 'Activer la boutique';
+$_LANGADM['AdminMaintenance894cd7887e47ca0e836e31577664b1ea'] = 'Adresses IP autorisées à accéder au front-office même si la boutique est désactivée. Utilisez une virgule (\",\") pour les séparer (par exemple, 42.24.4.2,127.0.0.1,99.98.97.96)';
+$_LANGADM['AdminMaintenancedaf835712085aaaf81818e7ebfeb66b8'] = 'IP de maintenance';
 $_LANGADM['AdminManufacturers0071aa279bd1583754a544277740f047'] = 'Supprimer l\'élément n°';
 $_LANGADM['AdminManufacturers0099c0173a3c7758b36025bdae9b4fc7'] = 'Activer :';
 $_LANGADM['AdminManufacturers00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
@@ -1812,14 +1829,19 @@ $_LANGADM['AdminMeta193cfc9be3b995831c6af2fea6650e60'] = 'Page';
 $_LANGADM['AdminMeta1dec4f55522b828fe5dacf8478021a9e'] = 'URL simplifiée :';
 $_LANGADM['AdminMeta2979a7ecfaf65f58d0adcf78e2948c8d'] = 'Vous pouvez changer ici le format de vos liens. Il y a plusieurs mots-clés disponibles pour chaque route listée ci-dessous. Les mots-clés avec * sont obligatoires. Pour ajouter un mot-clé dans l\'URL, utilisez la syntaxe {motclé}. Vous pouvez ajouter du texte avant ou après le mot-clé, qui s\'affichera si le contenu du mot-clé n\'est pas vide, avec la syntaxe {avant:motclé:après}. Par exemple {-bonjour-:meta_title} ajoutera \"-bonjour-mon-titre\" dans l\'URL si la méta titre est remplie, autrement il n\'affichera rien. Les URL simplifiées et le module mod_rewrite d\'Apache doivent être activés sur votre serveur pour pouvoir utiliser cette option.';
 $_LANGADM['AdminMeta2affaa9860b7565fac919c53798b398d'] = 'Exemple : \"contacts\" pour http://maboutique.com/shop/contacts redirigera vers http://maboutique.com/shop/contact-form.php';
+$_LANGADM['AdminMeta345d6249c20c6319bb09edaaf536744b'] = 'Génération du fichier robots.txt';
 $_LANGADM['AdminMeta36bdb6de116cea25f90c6ff3e2c0e100'] = 'URL réécrite :';
 $_LANGADM['AdminMeta38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminMeta394deec8b4e901394f69ad41095b1ecc'] = 'Méta mots-clés :';
+$_LANGADM['AdminMeta3b823baba7abb920bd1c18104ae7537b'] = 'Votre fichier robots.txt DOIT être dans le dossier racine de votre site web, et nulle part ailleurs.';
 $_LANGADM['AdminMeta44bc5350d0a72d6f348aaeebb4004d8e'] = 'Rediriger automatiquement vers l\'URL canonique';
 $_LANGADM['AdminMeta4b9a9672a96a435f1d15ad934e093104'] = 'Route vers les modules';
 $_LANGADM['AdminMeta5575f8bf467eba7499f22e78db6f3f56'] = 'Route vers les produits';
 $_LANGADM['AdminMeta6049980ef775b17f7f0b3624ae121733'] = 'L\'URL rewriting (mod_rewrite) n\'est pas activé sur votre serveur. Si vous voulez utiliser les URL simplifiées, veuillez activer ce module Apache.';
 $_LANGADM['AdminMeta6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Caractères non valables :';
+$_LANGADM['AdminMeta6bd35b70de933ef8bfeee04ea40b9a25'] = 'créez un fichier vide robots.txt à la racine de votre site';
+$_LANGADM['AdminMeta7959e21ff0b83542251ca0b4e9a62eea'] = 'Générer le fichier robots.txt';
+$_LANGADM['AdminMeta7dc12aaf3ebf9e01ef5b2ec91761c26a'] = 'N\'activez cette option que si vous rencontrez des problèmes avec la redirection d\'URL de certaines pages.';
 $_LANGADM['AdminMeta82fa9d45784fa48b4a37f4e225de5451'] = 'Une courte description';
 $_LANGADM['AdminMeta83495f05c4aa5f326f23b6d58d0da5e6'] = 'Route vers les catégories CMS';
 $_LANGADM['AdminMeta8eee2883d683841b6ab08c1bb6d13fb7'] = 'Route vers les pages CMS';
@@ -1827,8 +1849,11 @@ $_LANGADM['AdminMeta8f815100fbc9398e9441b28d219e0ca4'] = 'Route vers les marques
 $_LANGADM['AdminMeta93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
 $_LANGADM['AdminMeta9ca94e67feafa7c087ed70257d54ce53'] = 'Mots-clés : %s';
 $_LANGADM['AdminMetaa6bb76858f8b4b61c050ad7a7ac57e06'] = 'Méta description :';
+$_LANGADM['AdminMetaacaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Désactiver l\'option Apache MultiViews';
+$_LANGADM['AdminMetab65cc08420e484602c7c313336933452'] = 'Ex. : http://www.monsite.com/robots.txt';
 $_LANGADM['AdminMetab718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminMetab78a3223503896721cca1303f776159b'] = 'Titre';
+$_LANGADM['AdminMetab8a27e47e64caa3e36c8894c3745357b'] = 'Avant de pouvoir utiliser cet outil, vous devez :';
 $_LANGADM['AdminMetabafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
 $_LANGADM['AdminMetabc5d446bc10f94f2132fa898d11a423a'] = 'Configuration des URL';
 $_LANGADM['AdminMetac12e753c3108c17350db4e5990ff626e'] = 'Liste des mots-clés';
@@ -1837,11 +1862,13 @@ $_LANGADM['AdminMetad3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélectio
 $_LANGADM['AdminMetad65773e40ecde8c2b27057f09fc868ff'] = 'Titre de la page :';
 $_LANGADM['AdminMetada82a2002384409477655085d5c4136e'] = 'N\'activez cette option que si votre serveur autorise la réécriture d\'URL (recommandé).';
 $_LANGADM['AdminMetadbb5f11eab5c5c375c4c5face47ddf1e'] = 'Page :';
+$_LANGADM['AdminMetae1a19fd908ac5462b7341173e3d45afd'] = 'donnez les permissions d\'écriture au fichier (CHMOD 666 sur un système Unix)';
 $_LANGADM['AdminMetae1a7478962f9872f0765922496b26851'] = 'Il n\'y a pas de page disponible !';
 $_LANGADM['AdminMetae25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?';
 $_LANGADM['AdminMetae67422bc0428fba3af157a4d4851d2b4'] = 'Titre de la page concernée';
 $_LANGADM['AdminMetae73d8e659020c1acff040a3a3eaf9d21'] = 'Recommandé mais votre thème doit être conforme.';
 $_LANGADM['AdminMetaf7d367e5791685828ef2f3d6f2148484'] = 'Nom de la page concernée';
+$_LANGADM['AdminMetafe358d16c495908eaff53cb8bc8f3352'] = 'Générez votre fichier \"robots.txt\" en cliquant sur le bouton suivant (cela écrasera votre fichier robots.txt actuel)';
 $_LANGADM['AdminModules0095a9fa74d1713e43e370a7d7846224'] = 'Export';
 $_LANGADM['AdminModules00c3388449f7c4d73cc8c417d7d38554'] = 'Tous les modules';
 $_LANGADM['AdminModules02684cc6b6ea1811a064f475a5fd1d18'] = 'Auteurs';
@@ -1974,6 +2001,34 @@ $_LANGADM['AdminOrderMessage940663fd4428d2c86f9a4780b6574028'] = 'Message :';
 $_LANGADM['AdminOrderMessageb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminOrderMessaged3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
 $_LANGADM['AdminOrderMessagee25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer la sélection ?';
+$_LANGADM['AdminOrderPreferences0d8bdbe98feb696dd76760ee1374a740'] = 'Taxe des emballages cadeaux';
+$_LANGADM['AdminOrderPreferences0db377921f4ce762c62526131097968f'] = 'Général';
+$_LANGADM['AdminOrderPreferences11e7774c4aeee369f9de701a795fb58d'] = 'Cette fonctionnalité permet le passage de commande sans création de compte';
+$_LANGADM['AdminOrderPreferences28a318da44a83a4124b9cbcfa4978722'] = 'Propose l\'emballage cadeau au client et la possibilité de laisser un message ';
+$_LANGADM['AdminOrderPreferences2a0677dae563d574fb1c50badaa4eabf'] = 'Tarifs emballages cadeaux';
+$_LANGADM['AdminOrderPreferences342b52e8fe475dc8b5bf11afbfd46ea4'] = 'Requiert l\'acceptation des CGV par le client durant la commande';
+$_LANGADM['AdminOrderPreferences38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
+$_LANGADM['AdminOrderPreferences403e42a4b26e379cb13563c98ab63067'] = 'Activer la commande express (guest checkout)';
+$_LANGADM['AdminOrderPreferences59aad85b376259844b471a758908a3c1'] = 'Type de processus de commande';
+$_LANGADM['AdminOrderPreferences6adf97f83acf6453d4a6a4b1070f3754'] = 'Aucun';
+$_LANGADM['AdminOrderPreferences6c9f73b6b5d16baa641cf8343348eb8d'] = 'Vous pouvez choisir le type de processus de command : standard (5 étapes, 5 pages) ou \"One Page Checkout\" (5 étapes au sein d\'une même page)';
+$_LANGADM['AdminOrderPreferences6cda6c81a66d7faecf49e94a3b55e924'] = 'Choisissez la page CMS de conditions générales de vente';
+$_LANGADM['AdminOrderPreferences8730643a0c64ae839f141d0fb52bf21d'] = 'Permettre aux clients de fractionner leurs commandes. Une avec les produits \"en stock\", et une autre avec les autres produits. Cette option va transformer le panier des clients dans deux commandes.';
+$_LANGADM['AdminOrderPreferences9311ccba175a9f2fc72e7c6a3dfb6078'] = 'Fixe une taxe pour le prix de l\'emballage cadeau';
+$_LANGADM['AdminOrderPreferences9d2f8578a64b498b2d164f7cc8e9086c'] = 'Montant total minimum requis pour valider une commande :';
+$_LANGADM['AdminOrderPreferencesa2c3880e68cde73646da32ea19e17ab8'] = 'Autoriser l\'envoi multiple';
+$_LANGADM['AdminOrderPreferencesaad3af5c95ba38f8687b6c35ed6e7218'] = 'Permettre aux clients d\'expédier leurs commande à différentes adresses. Cette option va transformer le panier des clients en une ou plusieurs commandes.';
+$_LANGADM['AdminOrderPreferencesb563636fd3896671be0104bbc6783be4'] = 'One page checkout';
+$_LANGADM['AdminOrderPreferencesb667478ccafce4bff6d427a6bca06269'] = 'Proposer des emballages recyclés';
+$_LANGADM['AdminOrderPreferencesbf3b3ed0e4fd43efff9c26b3d35c6c2f'] = 'Options des emballages cadeaux';
+$_LANGADM['AdminOrderPreferencesc035796995e11f000835780bbadbd575'] = 'Standard (5 étapes)';
+$_LANGADM['AdminOrderPreferencesc173252856179a44a9506a968359de8b'] = 'Fixe un prix pour l\'emballage cadeau';
+$_LANGADM['AdminOrderPreferencesca9bccbec65b9e333e8896dbe43369df'] = '0 pour désactiver cette fonctionnalité.';
+$_LANGADM['AdminOrderPreferencescd6aaf6d8287fd5a49122d36f0ff7024'] = 'Envoi différé';
+$_LANGADM['AdminOrderPreferencescd712537c39c43dcbf61e61a6df83cdd'] = 'Proposer des emballages cadeaux';
+$_LANGADM['AdminOrderPreferencesd4d27f93d89b170800f7896e3e438468'] = 'Page CMS de conditions générales de vente';
+$_LANGADM['AdminOrderPreferencese4045598261988d9988c594243a9434d'] = 'Conditions générales de vente';
+$_LANGADM['AdminOrderPreferencese84eed89f38f20639431d99ad2f5ee8a'] = 'Suggérer au client de choisir un colis en matières recyclées';
 $_LANGADM['AdminOrders004bf6c9a40003140292e97330236c53'] = 'Action';
 $_LANGADM['AdminOrders0110ae516fc412d9e286afdb312caeb4'] = 'Propriétaire de la carte :';
 $_LANGADM['AdminOrders01abfc750a0c942167651c40d088531d'] = 'n°';
@@ -2209,8 +2264,6 @@ $_LANGADM['AdminOutstandingb9894a8360f66fa7c87aebe79d2f5021'] = 'Encours courant
 $_LANGADM['AdminOutstandingbcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
 $_LANGADM['AdminOutstandingc4e8e61e01875cfb720e75c7d97b9c88'] = 'Encours autorisé';
 $_LANGADM['AdminOutstandingce26601dac0dea138b7295f02b7620a7'] = 'Client';
-$_LANGADM['AdminPPreferences044a77653804fe33652d68098d98121e'] = 'Utiliser l\'ancien système de stockage d\'images';
-$_LANGADM['AdminPPreferences048a517fd1781ed314402df592f2ea68'] = 'Largeur image produit :';
 $_LANGADM['AdminPPreferences0499db31e756ee9a4f209cad2fafcbf4'] = 'Afficher les dernières quantités lorsque celles-ci sont inférieures à :';
 $_LANGADM['AdminPPreferences068f80c7519d0528fb08e82137a72131'] = 'Produits';
 $_LANGADM['AdminPPreferences08ed0bcf3c2ad0458a120a7b46fb11aa'] = 'Afficher les attributs indisponibles sur la fiche produit :';
@@ -2221,11 +2274,9 @@ $_LANGADM['AdminPPreferences18ab46929929152a148ad898fe038ccf'] = 'Ordre de tri p
 $_LANGADM['AdminPPreferences24c3ed033892f4548a23e4c50e8f6e7f'] = 'Le bouton \"Ajouter au panier\" est caché lorsque le produit est indisponible ';
 $_LANGADM['AdminPPreferences2593c7ce3ff937293feb1e61c152e551'] = 'caractères';
 $_LANGADM['AdminPPreferences290b7c47045d269e2ccfa69e6477acfe'] = 'Prix du produit';
-$_LANGADM['AdminPPreferences32465c25dfecca0db61214b9af3bd9f1'] = 'Taille maximum des images des produits :';
 $_LANGADM['AdminPPreferences39cb26ab18c110579dec495581a11552'] = 'Redirection après avoir ajouté un produit au panier :';
 $_LANGADM['AdminPPreferences3ae332007d1df0ff39971bc1ae7ae27c'] = 'Nombre maximum de produits dans le comparateur :';
 $_LANGADM['AdminPPreferences3cfcde53f39184634bc7b2344479fbc4'] = 'Position dans la catégorie';
-$_LANGADM['AdminPPreferences4b3a6218bb3e3a7303e8a171a60fcf92'] = 'octets';
 $_LANGADM['AdminPPreferences4b8d849da50c8e72f839c5c7e1abfe95'] = 'page précédente';
 $_LANGADM['AdminPPreferences5b84212579db9037cfe4f22863b17789'] = 'Date d\'ajout';
 $_LANGADM['AdminPPreferences68217d833599eb6fb56f9e6d2ca24196'] = 'Comment calculer les remises de quantité';
@@ -2238,36 +2289,25 @@ $_LANGADM['AdminPPreferences7dbe88f99044a2b7e37ae992b8651be4'] = 'Produits (gene
 $_LANGADM['AdminPPreferences88694e637431115721b5241e652a178f'] = 'Remises des quantités basées sur :';
 $_LANGADM['AdminPPreferences90dc497d9d6686ce91ad5c94524020f0'] = 'Mode catalogue :';
 $_LANGADM['AdminPPreferences990f7aaf94657fef90a1326a88958c78'] = 'Concerne uniquement la version non-Ajax du panier';
-$_LANGADM['AdminPPreferences9a61f5ce3180789a8455f536681cabc1'] = 'Hauteur image produit :';
 $_LANGADM['AdminPPreferences9b8bbcbf5a2788eb2d27b237413f7cd8'] = 'Afficher le bouton \"ajouter au panier\" lorsque le produit a des attributs :';
-$_LANGADM['AdminPPreferences9d2f8578a64b498b2d164f7cc8e9086c'] = 'Montant total minimum requis pour valider une commande :';
-$_LANGADM['AdminPPreferences9df22f196a33acd0b372fe502de51211'] = 'auto';
 $_LANGADM['AdminPPreferences9df736cf267f1f94c5a4997fecbd4e3d'] = 'Définissez la taille maximale de la description courte du produit';
 $_LANGADM['AdminPPreferencesa41e05ded65532b4ca855a20da95bc32'] = 'Préciser ici le seuil à partir duquel sera affiché un message annonçant une prochaine rupture de stock.';
 $_LANGADM['AdminPPreferencesa655e39faa3b79bdbfdbe59be2aa1013'] = 'Activer JqZoom au lieu de Thickbox sur les pages produits :';
-$_LANGADM['AdminPPreferencesb435e227d5dd201e1768b2bcb2e0aa81'] = 'hauteur';
 $_LANGADM['AdminPPreferencesb9208b03bcc9eb4a336258dcdcb66207'] = 'Déclinaisons';
 $_LANGADM['AdminPPreferencesc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Marque';
 $_LANGADM['AdminPPreferencesc2afe59ae613c1b64c27dba13257e404'] = 'Activer la gestion des stocks avancée :';
-$_LANGADM['AdminPPreferencesc4d833424eba2cd43c9327d4943dc61f'] = 'Image générée par :';
 $_LANGADM['AdminPPreferencesc7c54c4ed31886079cd525b60c8867c1'] = 'Afficher ou masquer le bouton \"Ajouter au panier\"  sur les pages catégories des produits qui ont des attributs pour forcer les clients à voir le détail du produit.';
-$_LANGADM['AdminPPreferencesc9c4e9c1a92d9b15e0cdefc7ddb1bbd5'] = 'La largeur maximum des images envoyées par les clients (en pixels)';
 $_LANGADM['AdminPPreferencesca267c647010fcc8c76e3ccd3fddd572'] = 'Tri par défaut pour la liste des produits';
 $_LANGADM['AdminPPreferencesca7de506b98e6e8c63285923677507de'] = 'Nombre de produits par page. Valeur par défaut : 10';
 $_LANGADM['AdminPPreferencesca9bccbec65b9e333e8896dbe43369df'] = '0 pour désactiver cette fonctionnalité.';
 $_LANGADM['AdminPPreferencescbb81506a7fe3ef03f7a89c76c52131a'] = 'Pagination';
 $_LANGADM['AdminPPreferencescf3fb1ff52ea1eed3347ac5401ee7f0c'] = 'Croissant';
-$_LANGADM['AdminPPreferencescf9694d1337719003737cc35e3c31eb9'] = 'Images produit';
 $_LANGADM['AdminPPreferencesd6749853deb2dfe0920371d50fbbb377'] = 'Vous permet de gérer un stock physique, des entrepôts, et des commandes fournisseurs.';
 $_LANGADM['AdminPPreferencesd920ec381c352d9d92a53ed3d261e8c6'] = 'Date de modification';
 $_LANGADM['AdminPPreferencesdcf765af784bde828a35fc529a1760ef'] = 'Ordre par défaut :';
-$_LANGADM['AdminPPreferencesdde6c96bcb0af50f18f37572267d904a'] = 'La hauteur maximum des images envoyées par les clients (en pixels)';
 $_LANGADM['AdminPPreferencesdf644ae155e79abf54175bd15d75f363'] = 'Nom du produit';
 $_LANGADM['AdminPPreferencese3cf5ac19407b1a62c6fccaff675a53b'] = 'Décroissant';
 $_LANGADM['AdminPPreferencese4636eaae9d9044b9ae49392197713ed'] = 'Tri par défaut :';
-$_LANGADM['AdminPPreferencese57fbdf001b4b35e6ca7dcdc628ca853'] = 'La taille maximum des images envoyées par les clients (en octets)';
-$_LANGADM['AdminPPreferencese7ed00268dc16aecaac5a60aeb6f4c73'] = 'Ce réglage doit rester sur \"Oui\" à moins que vous n’ayez déplacé avec succès les images dans l\'onglet Préférences, sous-onglet Images';
-$_LANGADM['AdminPPreferenceseaae26a6fb20ed3ef54fb23bfa0b1fcc'] = 'largeur';
 $_LANGADM['AdminPPreferenceseb763a2e313718f33f55e1f0d84df6ee'] = 'Page produit';
 $_LANGADM['AdminPPreferencesff26a60315cd84533d5339ba26617988'] = 'Stocks produit';
 $_LANGADM['AdminPayment1b1e7483572e24b802c4f4dec44b7a31'] = 'Restrictions des groupes';
@@ -2290,6 +2330,7 @@ $_LANGADM['AdminPerformance029c7c02d736e799563e65ab25824886'] = 'Serveur de méd
 $_LANGADM['AdminPerformance02d56cf7754ce16d7ce0193fbca7c90a'] = 'Cache';
 $_LANGADM['AdminPerformance05894ba2c918dd33592bf1bd21c347f6'] = 'Memcached';
 $_LANGADM['AdminPerformance0ae00a25b134fd5949f4e08e28194b1b'] = 'Poids :';
+$_LANGADM['AdminPerformance0b388064aa29e8576990d9eb5da8d43e'] = 'Optimisation Apache';
 $_LANGADM['AdminPerformance0d6bf1934cab1de045b189eed03c3d42'] = 'Devrait être activé sauf pour les tests et débogage.';
 $_LANGADM['AdminPerformance0e68f753bc601f5d9d04717f95042762'] = 'APC';
 $_LANGADM['AdminPerformance17d7cd0c1cf06a808fe23302666ea48c'] = 'Ces fonctionnalités vont être désactivées :';
@@ -2298,6 +2339,7 @@ $_LANGADM['AdminPerformance1f1950e2be8e805605b5716b45b5c97e'] = 'Les templates s
 $_LANGADM['AdminPerformance209007e0c3ea294541d8dbaf9b2c0cc8'] = 'Utiliser le cache :';
 $_LANGADM['AdminPerformance21021ea0e52be8e9c599f4dff41e5be0'] = 'Caractéristique';
 $_LANGADM['AdminPerformance32a2e7694628335252aceb0552a6f6ba'] = 'Pour utiliser Memcached, vous devez installer l\'extension Memcached PECL sur votre serveur.';
+$_LANGADM['AdminPerformance32d593fb52ab5e4ae3f16844b576867d'] = 'En cochant cette case, votre fichier .htaccess sera complété automatiquement avec des directives améliorant le cache et la compression.';
 $_LANGADM['AdminPerformance38ca568bbe61771c6456a5c7b8d419ee'] = 'Xcache';
 $_LANGADM['AdminPerformance38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminPerformance39288e61e4ec7652a64de79b94be2c78'] = 'Compression maximum du code HTML (risqué)';
@@ -2373,80 +2415,19 @@ $_LANGADM['AdminPerformancef8198a372da81edfca0693a81242149d'] = 'Mcrypt est plus
 $_LANGADM['AdminPerformancef8d698aea36fcbead2b9d5359ffca76f'] = 'Smarty';
 $_LANGADM['AdminPerformancefdb3644651f3871a5e73f4dc271b64e3'] = 'Conserver le fonctionnement classique';
 $_LANGADM['AdminPerformancefdf1da3a7cc0e1cb2ef78f7b5658f422'] = 'Cache des templates :';
-$_LANGADM['AdminPreferences049104cffa3c1841dece50e6e41f749c'] = 'Activez ou désactivez votre boutique. Désactivez votre boutique pendant que vous effectuez la maintenance. Veuillez noter que le webservice ne sera pas désactivé pour autant et que vos données seront toujours accessibles par ce biais.';
-$_LANGADM['AdminPreferences051fd283c29527d33402475333dfb1da'] = 'Afficher les notifications lorsque de nouveaux clients vous enverront de nouveaux messages sur votre boutique';
-$_LANGADM['AdminPreferences0d8bdbe98feb696dd76760ee1374a740'] = 'Taxe des emballages cadeaux';
 $_LANGADM['AdminPreferences0db377921f4ce762c62526131097968f'] = 'Général';
-$_LANGADM['AdminPreferences11e7774c4aeee369f9de701a795fb58d'] = 'Cette fonctionnalité permet le passage de commande sans création de compte';
-$_LANGADM['AdminPreferences12cbe1a4645659457808631047989afb'] = 'Maximum :';
-$_LANGADM['AdminPreferences1301a51cbee38f0c34369720070e5e1b'] = 'Limite de téléchargement de fichier';
 $_LANGADM['AdminPreferences1656072e927c8d3acd24359cbb648bb5'] = 'Activer le SSL';
-$_LANGADM['AdminPreferences16c390c0fd1efc4f493a6a861aa22d2f'] = 'Bulles d\'aide du back-office';
-$_LANGADM['AdminPreferences1b1befcb86d487715da458117710dfeb'] = 'Affiche les notifications pour les nouvelles commandes';
 $_LANGADM['AdminPreferences27f3765c3871cd5fe52f88f31dfe2c89'] = 'supérieur';
-$_LANGADM['AdminPreferences28a318da44a83a4124b9cbcfa4978722'] = 'Propose l\'emballage cadeau au client et la possibilité de laisser un message ';
-$_LANGADM['AdminPreferences2a0677dae563d574fb1c50badaa4eabf'] = 'Tarifs emballages cadeaux';
-$_LANGADM['AdminPreferences2ca89cca013873c7f841e1acf242b3d6'] = 'Définissez la taille maximale des fichiers joints (en mégaoctets).';
-$_LANGADM['AdminPreferences3009d174d7831e0445125204c567d195'] = 'Active ou désactive le mode B2B. Lorsque cette option est active, plusieurs fonctionnalités B2B deviennent disponibles.';
-$_LANGADM['AdminPreferences342b52e8fe475dc8b5bf11afbfd46ea4'] = 'Requiert l\'acceptation des CGV par le client durant la commande';
 $_LANGADM['AdminPreferences38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
-$_LANGADM['AdminPreferences3aadb5e86b174ecada1174e22f5a6368'] = 'Poids maximum des fichiers joints';
-$_LANGADM['AdminPreferences403e42a4b26e379cb13563c98ab63067'] = 'Activer la commande express (guest checkout)';
-$_LANGADM['AdminPreferences46f18d3960afc01e5a1a5a0e0e9d571b'] = 'Vérifier automatiquement les mises à jour de modules';
-$_LANGADM['AdminPreferences47ff1aadf05084936c5c2465c796048d'] = 'L\'option \"Création de compte seulement\" permet au client de s\'enregistrer plus vite et de n\'enregistrer son adresse que plus tard.';
 $_LANGADM['AdminPreferences4be87dc8773fa2fb95b7b8302cb47fa9'] = 'Afficher les fournisseurs et les marques même si les blocs correspondants sont désactivés';
-$_LANGADM['AdminPreferences4e7ff7ca556a7ac8329ab27834e9631b'] = 'Affiche les notifications pour les nouveaux messages';
-$_LANGADM['AdminPreferences5870c50004d9568f8de39d09363533a7'] = 'Limite de téléchargement d\'images';
-$_LANGADM['AdminPreferences59aad85b376259844b471a758908a3c1'] = 'Type de processus de commande';
-$_LANGADM['AdminPreferences656ff9c98ad48192724f8a74f5e18733'] = 'Définit la limite de téléchargement pour un produit. Cette valeur doit être inférieure ou égale à celle de votre serveur';
-$_LANGADM['AdminPreferences686a2ac82a5a64eca870ba9a55b8a675'] = 'De nouveaux modules et mises à jour sont affichés sur la page des modules';
-$_LANGADM['AdminPreferences6adf97f83acf6453d4a6a4b1070f3754'] = 'Aucune';
-$_LANGADM['AdminPreferences6c9f73b6b5d16baa641cf8343348eb8d'] = 'Vous pouvez choisir le type de processus de command : standard (5 étapes, 5 pages) ou \"One Page Checkout\" (5 étapes au sein d\'une même page)';
-$_LANGADM['AdminPreferences6cda6c81a66d7faecf49e94a3b55e924'] = 'Choisissez la page CMS de conditions générales de vente';
-$_LANGADM['AdminPreferences6d964e25aa6aa88c8353880e00202cf4'] = 'Indiquez le nombre d\'heures';
 $_LANGADM['AdminPreferences700e61469b84a66ddb24304a85b0c181'] = 'classique';
-$_LANGADM['AdminPreferences77dcf778f486e4dcbe5b400bd08ac3a6'] = 'mégaoctets';
 $_LANGADM['AdminPreferences79a8435260e0c3b17e30ccb1c6dfc75c'] = 'Afficher les fournisseurs et les marques';
-$_LANGADM['AdminPreferences7fe15a347d66e291d7a1375273226205'] = 'Activer la boutique';
-$_LANGADM['AdminPreferences8004e61ca76ff500d1e6ee92f7cb7f93'] = 'Affiche les notifications pour les nouveaux clients';
-$_LANGADM['AdminPreferences8730643a0c64ae839f141d0fb52bf21d'] = 'Permettre aux clients de fractionner leurs commandes. Une avec les produits \"en stock\", et une autre avec les autres produits. Cette option va transformer le panier des clients dans deux commandes.';
-$_LANGADM['AdminPreferences894cd7887e47ca0e836e31577664b1ea'] = 'Adresses IP autorisées à accéder au front-office même si la boutique est désactivée. Utilisez une virgule (\",\") pour les séparer (par exemple, 42.24.4.2,127.0.0.1,99.98.97.96)';
-$_LANGADM['AdminPreferences8cde7b1fa570f328143c41677032b507'] = 'Définit la limite de téléchargement pour une image. Cette valeur doit être inférieure ou égale à celle de votre serveur';
-$_LANGADM['AdminPreferences8d7a93422a7ecd89d12811e22055f6d5'] = 'Récupération du panier après l\'authentification du client';
 $_LANGADM['AdminPreferences8de64d6b49cebd2306af6ddbcd268700'] = 'Si votre hébergeur propose le protocole SSL, vous pouvez activer le cryptage SSL (https://) pour l\'identification des clients et le processus de commande';
-$_LANGADM['AdminPreferences9311ccba175a9f2fc72e7c6a3dfb6078'] = 'Fixe une taxe pour le prix de l\'emballage cadeau';
 $_LANGADM['AdminPreferences95be164e850e88c5282e84669f368e1b'] = 'Vous pouvez choisir le mode d\'arrondi : arrondir toujours au supérieur, à l\'inférieur, ou arrondi classique.';
-$_LANGADM['AdminPreferences9cfc2e28ebe44b3e14f9d780d2150650'] = 'Vérifiez l\'adresse IP du cookie afin d\'éviter que votre cookie soit volé';
-$_LANGADM['AdminPreferences9f7a304fd501ed0e4d06b899fed739d0'] = 'Création de compte seulement';
-$_LANGADM['AdminPreferencesa2c3880e68cde73646da32ea19e17ab8'] = 'Autoriser l\'envoi multiple';
-$_LANGADM['AdminPreferencesa9fff6d50be898f47a507354626b8b8d'] = 'Masquer les conseils d\'optimisation';
-$_LANGADM['AdminPreferencesaad3af5c95ba38f8687b6c35ed6e7218'] = 'Permettre aux clients d\'expédier leurs commande à différentes adresses. Cette option va transformer le panier des clients en une ou plusieurs commandes.';
 $_LANGADM['AdminPreferencesac2021d3c67ee796d7ab20a466ebd583'] = 'Règle d\'arrondi';
-$_LANGADM['AdminPreferencesae1d865ef6ce7ebb9492ea7a7f1bc8a5'] = 'Afficher les notifications lorsque de nouveaux clients s\'inscriront sur votre boutique';
-$_LANGADM['AdminPreferencesb563636fd3896671be0104bbc6783be4'] = 'One page checkout';
-$_LANGADM['AdminPreferencesb667478ccafce4bff6d427a6bca06269'] = 'Proposer des emballages recyclés';
 $_LANGADM['AdminPreferencesbbd6622dbbdf4bcb166f5e3f018a2351'] = 'Cliquez ici pour utiliser le protocole HTTPS avant d\'activer le mode SSL.';
-$_LANGADM['AdminPreferencesbcb9adf1d2347258b5c65483e34cf86f'] = 'Type de processus d\'enregistrement';
-$_LANGADM['AdminPreferencesc035796995e11f000835780bbadbd575'] = 'Standard (5 étapes)';
-$_LANGADM['AdminPreferencesc173252856179a44a9506a968359de8b'] = 'Fixe un prix pour l\'emballage cadeau';
-$_LANGADM['AdminPreferencesc760118c537146713521758269a44bd3'] = 'Activer le mode B2B';
-$_LANGADM['AdminPreferencesc87330f475e4384552c0077927d26e1a'] = 'Durée de vie du cookie front-office';
 $_LANGADM['AdminPreferencescce43372fe8624c0edf870f417557b84'] = 'Active ou désactive les jetons (tokens) en front-office afin d\'améliorer la sécurité de PrestaShop';
-$_LANGADM['AdminPreferencescd6aaf6d8287fd5a49122d36f0ff7024'] = 'Envoi différé';
-$_LANGADM['AdminPreferencescd712537c39c43dcbf61e61a6df83cdd'] = 'Proposer des emballages cadeaux';
-$_LANGADM['AdminPreferencesd4d27f93d89b170800f7896e3e438468'] = 'Page CMS de conditions générales de vente';
-$_LANGADM['AdminPreferencesd5bc5fd307b108537039b6b6f98889d5'] = 'Fuseau horaire :';
-$_LANGADM['AdminPreferencesdaf835712085aaaf81818e7ebfeb66b8'] = 'IP de maintenance';
-$_LANGADM['AdminPreferencesdc58d598b2b22e50c5af01134305a4fb'] = 'Active l\'aide contextuelle en dessous des champs de saisie';
 $_LANGADM['AdminPreferencese12874163bcb256726ddfe643aa53a63'] = 'Améliore la sécurité du front-office';
-$_LANGADM['AdminPreferencese4045598261988d9988c594243a9434d'] = 'Conditions générales de vente';
-$_LANGADM['AdminPreferencese4e2107f99e82247d7e32ac7919c4416'] = 'Masquer les conseils d\'optimisation sur la page d\'accueil du panneau d\'administration';
-$_LANGADM['AdminPreferencese673b146824251548feecf1f3929aceb'] = 'Durée de vie du cookie back-office';
-$_LANGADM['AdminPreferencese6b03a6bdf49d1cd0655e0f7a3d990cb'] = 'Réafficher le panier après identification';
-$_LANGADM['AdminPreferencese84eed89f38f20639431d99ad2f5ee8a'] = 'Suggérer au client de choisir un colis en matières recyclées';
-$_LANGADM['AdminPreferencesed5454727fb14b9800ead242d0972184'] = 'Vérifier l\'IP dans le cookie';
-$_LANGADM['AdminPreferencesf2c822352f0e0a62e2de6d716475911b'] = 'Standard (création de compte et d\'adresse)';
-$_LANGADM['AdminPreferencesf79dc7c8a2b655f2dcae2ad1102b725b'] = 'Afficher les notifications lorsque de nouvelles commandes seront passées sur votre boutique';
 $_LANGADM['AdminPreferencesf8d23e159df67b2673d7c29166864453'] = 'inférieur';
 $_LANGADM['AdminProducts004bf6c9a40003140292e97330236c53'] = 'Action';
 $_LANGADM['AdminProducts0063394f0497bfd610ebac0aee7cfc34'] = 'Associations';
@@ -3152,34 +3133,49 @@ $_LANGADM['AdminSearch7442e29d7d53e549b78d93c46b8cdcfc'] = 'Commandes';
 $_LANGADM['AdminSearch8b5dd64ab8d0b8158906796b53a200e2'] = 'Adresse e-mail';
 $_LANGADM['AdminSearch9c37b7b6ff829e977df287900543ea54'] = 'Date de naissance';
 $_LANGADM['AdminSearchConf00204f71aee500f89085662a40f8a555'] = 'Active la recherche Ajax pour les visiteurs.';
+$_LANGADM['AdminSearchConf01d2aac5d20787a1e873f2bdc79b514a'] = 'Rechercher ce mot à la place.';
 $_LANGADM['AdminSearchConf05cdca5b85ff26e596c3af66ed4820d5'] = 'Poids de la catégorie';
+$_LANGADM['AdminSearchConf09319b10a5e3af8e97dc40523655a283'] = 'Saisir chaque alias séparé par une virgule (\",\") (par ex. : \'prestshop,preztashop,prestasohp\')';
 $_LANGADM['AdminSearchConf13348442cc6a27032d2b4aa28b75a5d3'] = 'Recherche';
 $_LANGADM['AdminSearchConf157ce71733eb58af6770c47cfbab1732'] = 'Un mot avec un poids de 8 aura 4 fois plus de valeur qu\'un mot avec un poids de 2.';
 $_LANGADM['AdminSearchConf1b25f9ffbf4d185dbb985380a04732cc'] = 'Poids des attributs';
 $_LANGADM['AdminSearchConf1c24b90abdb6175e6c57762446db435a'] = 'Les produits indexés ont été analysés par PrestaShop et apparaitront dans la recherche en front-office.';
+$_LANGADM['AdminSearchConf259b411f284388d228a30c1e2ed0c61d'] = 'Caractères interdits : <>;=#{}';
 $_LANGADM['AdminSearchConf26e424abe001fcfdcc85a2d59bacb567'] = 'Reconstruire l\'index.';
 $_LANGADM['AdminSearchConf2e2ef007bbe41bc68ee187fca0387520'] = 'Vous pouvez définir une tâche cron qui va reconstruire votre index en utilisant l\'URL suivante :';
+$_LANGADM['AdminSearchConf38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminSearchConf4381a423b1c744a58a00f9921327f4f7'] = 'Taille de mot minimum';
 $_LANGADM['AdminSearchConf483c40354fdf24fc335387dc1785ccd2'] = 'Avec la recherche Ajax, les 10 premiers produits correspondant aux mots-clés indiqués par l\'utilisateur apparaitront en temps réel sous le champ de recherche.';
 $_LANGADM['AdminSearchConf4871216a35362aebc0d9908e6e288765'] = 'Poids des caractéristiques';
+$_LANGADM['AdminSearchConf5aac38deec604d81565722cc5a2a6be1'] = 'Résultat :';
 $_LANGADM['AdminSearchConf5bff181421d95b49ad5ce5bb08f0ffbe'] = 'Mots à ne pas indexer';
 $_LANGADM['AdminSearchConf6af0a6ff1f2f2a61cbd8b98232314b03'] = 'Poids de la description courte';
 $_LANGADM['AdminSearchConf6b6f555863e195d03251e032e5215dc1'] = 'Si votre serveur arrête le processus avant qu\'il se termine, vous pouvez continuer l\'indexation en cliquant sur \"Ajouter à l\'index les produits manquant.\".';
 $_LANGADM['AdminSearchConf76a591808a254d4094e1c43f937b834f'] = 'Poids du nom du produit';
+$_LANGADM['AdminSearchConf792fd33273f5b3dbbcc6bd5de52b7e20'] = 'n\'est pas un résultat valable';
 $_LANGADM['AdminSearchConf7b4ab4349de14bddc973ec0339695854'] = 'C\'est pourquoi nous vous conseillons de mettre plus de poids pour les mots qui apparaissent dans le nom ou la référence d\'un des produits que ceux de la description. Ainsi, les résultats de la recherche seront aussi précis que possible.';
 $_LANGADM['AdminSearchConf88a84f6aa7f460b72f4a4b9dd9b9b714'] = 'Active la recherche instantanée pour les visiteurs.';
 $_LANGADM['AdminSearchConf89e75b6219e4f6de0200ad94812a5655'] = 'Ajouter à l\'index les produits manquant.';
 $_LANGADM['AdminSearchConf8a289df2d13df2450bfcc937a026dee3'] = 'Recherche Ajax';
 $_LANGADM['AdminSearchConf8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
 $_LANGADM['AdminSearchConf97af9b173ce5af301daaa0aeb5419c49'] = 'Veuillez saisir les mots séparés par un \"|\" (caractère \"barre verticale\").';
+$_LANGADM['AdminSearchConf9ab81f57823f6aeb02362291f23883e6'] = 'Alias';
 $_LANGADM['AdminSearchConf9bc82ee9ca6110810689927a77493617'] = 'Poids de la marque';
+$_LANGADM['AdminSearchConf9d2e974b83d9090b463dbcb2ef32ab51'] = 'n\'est pas un alias valable';
+$_LANGADM['AdminSearchConfa1f687d813c4e0c415cb5137fcb156c1'] = 'Alias :';
+$_LANGADM['AdminSearchConfa66ec6983e578c3ac4663171b39d168b'] = 'les deux champs sont requis';
 $_LANGADM['AdminSearchConfb528cee25edcbf2257878a5aead21a1d'] = 'Le \"poids\" d\'un mot représente son importance et sa pertinence pour le classement des produits lorsqu\'un utilisateur fait une recherche.';
 $_LANGADM['AdminSearchConfbbeec9bc726c86e461b48941118e4f3b'] = 'Recherche instantanée :';
 $_LANGADM['AdminSearchConfc152439199cebb7e1c27633efeaf1eda'] = 'Poids des tags';
 $_LANGADM['AdminSearchConfc1aa7600ab8604ee230fbf068ae3e032'] = 'Seuls les mots à partir de cette taille seront indexés.';
+$_LANGADM['AdminSearchConfc9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
 $_LANGADM['AdminSearchConfd09de235a4115d5c3ff8d8e75f2fa45c'] = 'Produits indexés :';
 $_LANGADM['AdminSearchConfd125a8ad45c31bd8d3d6502b357e944a'] = 'Avec la recherche instantanée, les résultats apparaitront immédiatement pendant que l\'utilisateur fait sa recherche.';
+$_LANGADM['AdminSearchConfd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
 $_LANGADM['AdminSearchConfda0d18febbbe9cd4e54b68aa72f1d231'] = 'Indexation';
+$_LANGADM['AdminSearchConfe25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer la sélection ?';
+$_LANGADM['AdminSearchConfe8f1ffb3f4695131d99e8815643aa79e'] = 'Création réussie';
+$_LANGADM['AdminSearchConfec53a8c4f07baed5d8825072c89799be'] = 'État';
 $_LANGADM['AdminSearchConff228001fc9ac806066ea0a61ca65abb6'] = 'La construction de l\'index des produict peut prendre plusieurs minutes.';
 $_LANGADM['AdminSearchConff391844c98222451204cbb678d591f86'] = 'Poids de la référence';
 $_LANGADM['AdminSearchConff90f799bc686f5d6a731b1f8074b4580'] = 'Poids de la description longue';
@@ -3632,17 +3628,20 @@ $_LANGADM['AdminStockMvtedc6fdf20f39ce77df67370431e4aa6a'] = 'Il y a pas de donn
 $_LANGADM['AdminStockMvtf8c8b903cb2e4f297e4b96d4b9c1e98a'] = 'Employé';
 $_LANGADM['AdminStockMvtfbd99ad01b92dbafc686772a39e3d065'] = 'UPC';
 $_LANGADM['AdminStores00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
+$_LANGADM['AdminStores0188aaac1db951dc90bced9ecd606c04'] = 'Affichée dans les e-mails envoyés aux clients';
 $_LANGADM['AdminStores0e2fb5b02182fd28b9b96e86ed27838f'] = 'Fax :';
 $_LANGADM['AdminStores1056348a5ee2b947804582ee224856ef'] = 'Affichage simplifié de la page de localisation de magasin :';
 $_LANGADM['AdminStores134592f3d9dadf4c4f76ef7e9e12fb57'] = 'Photo du magasin';
 $_LANGADM['AdminStores18325105de95083e4a1d10b78f29c2bc'] = 'État/région :';
 $_LANGADM['AdminStores1908624a0bca678cd26b99bfd405324e'] = 'La taille du fichier';
 $_LANGADM['AdminStores1cc70ef3820fa925ca1dd1ab645d239e'] = 'Caractères autorisés : lettres, espaces et';
+$_LANGADM['AdminStores237726599268adc200964601cdafeb16'] = 'Adresse e-mail de la boutique :';
 $_LANGADM['AdminStores24a23d787190f2c4812ff9ab11847a72'] = 'État';
 $_LANGADM['AdminStores28ff513c3d1589f6f46dcaee92f31172'] = 'Adresse (2) :';
 $_LANGADM['AdminStores2bf1d5fae1c321d594fdedf05058f709'] = 'Adresse :';
 $_LANGADM['AdminStores3225a10b07f1580f10dee4abc3779e6c'] = 'Paramètres';
 $_LANGADM['AdminStores38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
+$_LANGADM['AdminStores3c720ca57528095461f52d40d26d956a'] = 'Adresse du magasin (ligne 1) :';
 $_LANGADM['AdminStores46a2a41cc6e552044816a2d04634545d'] = 'État/région';
 $_LANGADM['AdminStores4851163a385d006adb115cda872b33b7'] = 'Utilisé pour la position par défaut de la carte';
 $_LANGADM['AdminStores49ee3087348e8d44e1feda1917443987'] = 'Nom';
@@ -3652,12 +3651,17 @@ $_LANGADM['AdminStores57d056ed0984166336b7879c2af3657f'] = 'Ville';
 $_LANGADM['AdminStores59716c97497eb9694541f7c3d37b1a4d'] = 'Pays';
 $_LANGADM['AdminStores5a6b8fd2f89cdbde7862a59462f58273'] = 'Longitude par défaut :';
 $_LANGADM['AdminStores5c7246a637866f706a8319f8f701497e'] = 'Afficher ou non ce magasin';
+$_LANGADM['AdminStores5dd532f0a63d89c5af0243b74732f63c'] = 'Coordonnées';
+$_LANGADM['AdminStores61f0fa926f97eafb392975ed79cebb4a'] = 'Nom de la boutique :';
+$_LANGADM['AdminStores63406c9482c644975f227cc93788e8fb'] = 'Choisissez votre pays';
 $_LANGADM['AdminStores642d3ba5db8b57e006584b544e490ec7'] = 'Code postal';
 $_LANGADM['AdminStores673ae02fffb72f0fe68a66f096a01347'] = 'Téléphone :';
 $_LANGADM['AdminStores6f8522e0610541f1ef215a22ffa66ff6'] = 'Lundi';
 $_LANGADM['AdminStores7515d32836da5648eb6a8f9113b7405b'] = 'Code postal :';
+$_LANGADM['AdminStores76cee53a1d378b50e5bc3aa50ab3b4c0'] = 'Immatriculation de la boutique (ex. : SIRET, RCS, ...)';
 $_LANGADM['AdminStores78ae6f0cd191d25147e252dc54768238'] = 'Jeudi';
 $_LANGADM['AdminStores78e365acb087fd1f8d494dae0001de10'] = 'Adresse e-mail :';
+$_LANGADM['AdminStores792ccc0c7f3d0d20366fbbf44ef7cd78'] = 'Affiché dans les en-têtes des pages et des e-mails';
 $_LANGADM['AdminStores796c163589f295373e171842f37265d5'] = 'Mercredi';
 $_LANGADM['AdminStores7da7bd98bbbcb62c935af8d362bb7a3e'] = 'Image : ';
 $_LANGADM['AdminStores7ef769cefe50f4eee90b1e1a22eb9172'] = 'Latitude par défaut :';
@@ -3680,11 +3684,14 @@ $_LANGADM['AdminStoresc33b138a163847cdb6caeeb7c9a126b4'] = 'Vendredi';
 $_LANGADM['AdminStoresc4d2dfcc9772ed9b143df5491e828235'] = 'Pas de carte, pas de recherche, juste un annuaire des magasins';
 $_LANGADM['AdminStoresca5acac9ef810c83a15e0da3babd2007'] = 'Nom du magasin, par exemple : Magasin du Citycentre Mall';
 $_LANGADM['AdminStoresd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
+$_LANGADM['AdminStoresd7ceaa3ddb4fc6884046456463ecb258'] = 'Immatriculation :';
+$_LANGADM['AdminStorese0ef7a9e00e6b6189c8da23da3fe79f8'] = 'Code postal :';
 $_LANGADM['AdminStorese25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?';
 $_LANGADM['AdminStoresf2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
 $_LANGADM['AdminStoresf64be5eef68442a8f50cf535b92ad3e4'] = 'Pays :';
 $_LANGADM['AdminStoresfc9d3df613063ee57906c461320744e2'] = 'Commentaire :';
 $_LANGADM['AdminStoresfcea88ad56b0839689d41643aa8abfd3'] = 'Latitude / Longitude :';
+$_LANGADM['AdminStoresffea2d321be109fc7243cfeb515fe257'] = 'Choisissez votre état/région (si cela s\'applique)';
 $_LANGADM['AdminSubDomains3547c78d942e86c858f271e467adb778'] = 'Sous-domaines :';
 $_LANGADM['AdminSubDomains38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminSubDomains51e2fe0e1a41fe9fec46ae2129bb8513'] = 'Sous-domaines';
@@ -4017,6 +4024,7 @@ $_LANGADM['AdminThemesaa94cba2130d7cdc43dd02920183bad1'] = 'Logo des factures :'
 $_LANGADM['AdminThemesb718adec73e04ce3ec720dd11a06a308'] = 'ID';
 $_LANGADM['AdminThemesbbb572a770006c9e0e57c9e5d4bcda90'] = 'En direct de PrestaShop Addons !';
 $_LANGADM['AdminThemesbd352f1bef1aa1ce2f42a0524bcb13e1'] = 'Attention : aucun logo d\'e-mail n\'étant défini, le logo de l\'en-tête est utilisé à la place.';
+$_LANGADM['AdminThemesc9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
 $_LANGADM['AdminThemesceccf85daef2a671b77af2b711e00c9c'] = 'Seul le format ICO est autorisé';
 $_LANGADM['AdminThemesd721757161f7f70c5b0949fdb6ec2c30'] = 'Thème';
 $_LANGADM['AdminThemesdd41ba374c974ba93cbf1299d98ee8bb'] = 'Attention : aucun logo de facture n\'étant défini, le logo de l\'en-tête est utilisé à la place.';