// Merge -> 10309

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
parent 2537c72189
commit 9d10de0848
365 changed files with 11185 additions and 1571 deletions
@@ -355,9 +355,9 @@ if ($lm->getIncludeTradFilename())

 		<h2><?php echo lang('What do you want to do?')?></h2>
 		<form id="formSetMethod" action="<?php $_SERVER['REQUEST_URI']; ?>" method="post">
-			<p><input <?php echo (!($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion)) ? 'checked="checked"' : '' ?> type="radio" value="install" name="typeInstall" id="typeInstallInstall" style="vertical-align: middle;" /> <label for="typeInstallInstall"><?php echo lang('I want to').' <b>'.lang('install').'</b> '.lang('a new online shop with PrestaShop'); ?></label></p>
+			<p><input <?php echo (!($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion)) ? 'checked="checked"' : '' ?> type="radio" value="install" name="typeInstall" id="typeInstallInstall" style="vertical-align: middle;" /> <label for="typeInstallInstall"><?php echo lang('I want to <b>install</b> a new online shop with PrestaShop'); ?></label></p>
 			<p style="font-style: italic;"><?php echo lang('- or -'); ?></p>
-			<p <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? '' : 'class="disabled"'; ?>><input <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? 'checked="checked"' : 'disabled="disabled"'; ?> type="radio" value="upgrade" name="typeInstall" id="typeInstallUpgrade" style="vertical-align: middle;" /> <label <?php echo ($oldversion === false) ? 'class="disabled"' : ''; ?> for="typeInstallUpgrade"><?php echo lang('I want to').' <b>'.lang('update').'</b> '.lang('my existing PrestaShop to a newer version'); ?> <?php echo ($oldversion === false) ? lang('(No previous version detected)') : ("(".(($tooOld) ? lang('Your current version is too old, updates are possible only from version').' '.MINIMUM_VERSION_TO_UPDATE.' '.lang('and higher') : ($installOfOldVersion ? lang('Your current version is already up-to-date') : lang('Currently installed version detected:').' <b>v'.$oldversion.'</b>')).")") ?></label></p>
+			<p <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? '' : 'class="disabled"'; ?>><input <?php echo ($oldversion AND !$tooOld AND !$sameVersions AND !$installOfOldVersion) ? 'checked="checked"' : 'disabled="disabled"'; ?> type="radio" value="upgrade" name="typeInstall" id="typeInstallUpgrade" style="vertical-align: middle;" /> <label <?php echo ($oldversion === false) ? 'class="disabled"' : ''; ?> for="typeInstallUpgrade"><?php echo lang('I want to <b>update</b> my existing PrestaShop to a newer version'); ?> <?php echo ($oldversion === false) ? lang('(No previous version detected)') : ("(".(($tooOld) ? lang('Your current version is too old, updates are possible only from version').' '.MINIMUM_VERSION_TO_UPDATE.' '.lang('and higher') : ($installOfOldVersion ? lang('Your current version is already up-to-date') : lang('Currently installed version detected:').' <b>v'.$oldversion.'</b>')).")") ?></label></p>
 		</form>
 		<h2><?php echo lang('License Agreement')?></h2>
 		<div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
@@ -1363,4 +1363,5 @@ if ($lm->getIncludeTradFilename())
 	<li>&copy; 2007-<?php echo date('Y'); ?></li>
 </ul>
 </body>
-</html>
+</html>
+
@@ -277,12 +277,9 @@ $_LANG['Other activity...'] = 'Andere activiteit...';
 $_LANG['Modules'] = 'Módulos';
 $_LANG['Benefits'] = 'Vorteile';
 $_LANG['Create a MySQL database using phpMyAdmin (or by asking your hosting provider)'] = '';
-$_LANG['- or -'] = '';
-$_LANG['I want to'] = '';
-$_LANG['install'] = '';
-$_LANG['a new online shop with PrestaShop'] = '';
-$_LANG['update'] = '';
-$_LANG['my existing PrestaShop to a newer version'] = '';
+$_LANG['- or -'] = '- oder -';
+$_LANG['I want to <b>install</b> a new online shop with PrestaShop'] = 'Ich m&ouml;chte einen neuen PrestaShop <b>installieren</b>';
+$_LANG['I want to <b>update</b> my existing PrestaShop to a newer version'] = 'Ich m&ouml;chte meinen <b>aktuellen</b> PrestaShop mit einer neueren Version aktualisieren';
 $_LANG['Your current version is too old, updates are possible only from version'] = '';
 $_LANG['and higher'] = '';
 $_LANG['PHP settings (for assistance, ask your hosting provider):'] = '';
@@ -290,4 +287,4 @@ $_LANG['Database Configuration'] = '';
 $_LANG['Database login:'] = '';
 $_LANG['Database password:'] = '';
 $_LANG['Please create a MySQL database and then verify your settings below. If you need assistance, please ask your hosting provider for this information.'] = '';
-$_LANG['No more information'] = '';
+$_LANG['No more information'] = '';
@@ -281,11 +281,8 @@ $_LANG['Modules'] = 'Módulos';
 $_LANG['Benefits'] = 'Beneficios';
 $_LANG['Create a MySQL database using phpMyAdmin (or by asking your hosting provider)'] = 'Crear un base de datos MySQL usando phpMyAdmin (o preguntele a su proveedor de alojamiento web)';
 $_LANG['- or -'] = ' - o -';
-$_LANG['I want to'] = 'Yo quiero';
-$_LANG['install'] = 'installar';
-$_LANG['a new online shop with PrestaShop'] = 'una nueva tienda online con PrestaShop';
-$_LANG['update'] = 'actualizar';
-$_LANG['my existing PrestaShop to a newer version'] = 'mi tienda PrestaShop actual a una nueva version';
+$_LANG['I want to <b>install</b> a new online shop with PrestaShop'] = 'Yo quiero <b>installar</b> una nueva tienda online con PrestaShop';
+$_LANG['I want to <b>update</b> my existing PrestaShop to a newer version'] = 'Quiero actualizar mi actual PrestaShop, a una nueva versi&oacute;n m&aacute;s reciente';
 $_LANG['Your current version is too old, updates are possible only from version'] = 'Su version actual esta antigua, actualizaciones solo estan disponibles desde la version';
 $_LANG['and higher'] = 'y en adelante';
 $_LANG['PHP settings (for assistance, ask your hosting provider):'] = 'PHP parámetros (para assistencia, preguntale a su proveedor de alojamiento web)';
@@ -287,11 +287,8 @@ $_LANG['Modules'] = 'Modules';
 $_LANG['Benefits'] = 'Avantages';
 $_LANG['Create a MySQL database using phpMyAdmin (or by asking your hosting provider)'] = 'Créer une base de données MySQL en utilisant phpMyAdmin (ou en demandant à votre hébergeur)';
 $_LANG['- or -'] = '- ou -';
-$_LANG['I want to'] = 'Je souhaite';
-$_LANG['install'] = 'installer';
-$_LANG['a new online shop with PrestaShop'] = 'une nouvelle boutique avec PrestaShop';
-$_LANG['update'] = 'mettre à jour';
-$_LANG['my existing PrestaShop to a newer version'] = 'ma boutique PrestaShop vers une nouvelle version';
+$_LANG['I want to <b>install</b> a new online shop with PrestaShop'] = 'Je souhaite <b>installer</b> une nouvelle boutique avec PrestaShop';
+$_LANG['I want to <b>update</b> my existing PrestaShop to a newer version'] = 'Je veux <b>mettre à jour</b> ma boutique PrestaShop vers une nouvelle version';
 $_LANG['Your current version is too old, updates are possible only from version'] = 'Votre version actuelle est trop ancienne, les mises à jour sont autorisées à partir de la version';
 $_LANG['and higher'] = 'et versions supérieures';
 $_LANG['PHP settings (for assistance, ask your hosting provider):'] = 'Paramètres PHP (Demandez de l\'aide à votre hébergeur si nécessaire)';
@@ -266,12 +266,9 @@ $_LANG['Other activity...'] = 'Altre attività ...';
 $_LANG['Modules'] = 'Moduli';
 $_LANG['Benefits'] = 'Vantaggi';
 $_LANG['Create a MySQL database using phpMyAdmin (or by asking your hosting provider)'] = '';
-$_LANG['- or -'] = '';
-$_LANG['I want to'] = '';
-$_LANG['install'] = '';
-$_LANG['a new online shop with PrestaShop'] = '';
-$_LANG['update'] = '';
-$_LANG['my existing PrestaShop to a newer version'] = '';
+$_LANG['- or -'] = '- o -';
+$_LANG['I want to <b>install</b> a new online shop with PrestaShop'] = 'Voglio <b>installare</b> un nuovo shop con PrestaShop';
+$_LANG['I want to <b>update</b> my existing PrestaShop to a newer version'] = 'Voglio <b>aggiornare</b> il mio PrestaShop esistente alla nuova versione';
 $_LANG['Your current version is too old, updates are possible only from version'] = '';
 $_LANG['and higher'] = '';
 $_LANG['PHP settings (for assistance, ask your hosting provider):'] = '';
@@ -282,4 +279,6 @@ $_LANG['Please create a MySQL database and then verify your settings below. If y
 $_LANG['Ok, please deactivate the following modules, I will reactivate them later:'] = '';
 $_LANG['You will be able to manually reactivate them in your Back Office once the update process has succeeded.'] = '';
 $_LANG['No more information'] = '';
-$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = '';
+$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = '';
+$_LANG['-- Select your country --'] = '-- scegliere il paese --';
+$_LANG['-- Select your timezone --'] = '-- Scegli il fuso orario --';
@@ -115,3 +115,4 @@ if (isset($_GET['method']))
 		break;
 	}
 }
+
@@ -0,0 +1,49 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function hook_blocksearch_on_header()
+{
+	if ($id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \'blocksearch\''))
+	{
+		$id_hook = Db::getInstance()->getValue('
+			SELECT `id_hook`
+			FROM `'._DB_PREFIX_.'hook`
+			WHERE `name` = \'header\'
+		');
+		
+		$position = Db::getInstance()->getValue('
+			SELECT MAX(`position`)
+			FROM `'._DB_PREFIX_.'hook_module`
+			WHERE `id_hook` = '.(int)$id_hook.'
+		');
+		
+		Db::getInstance()->Execute('
+			INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) 
+			VALUES ('.(int)$id_module.', '.(int)$id_hook.', '.($position+1).')
+		');
+	}
+}
@@ -0,0 +1,97 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function update_order_canada()
+	{
+	$sql ='SHOW TABLES LIKE \''._DB_PREFIX_.'order_tax\'';
+	$table = Db::getInstance()->ExecuteS($sql);
+
+	if (!count($table))
+	{
+		Db::getInstance()->Execute('
+		CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'order_tax` (
+		  `id_order` int(11) NOT NULL,
+		  `tax_name` varchar(40) NOT NULL,
+		  `tax_rate` decimal(6,3) NOT NULL,
+		  `amount` decimal(20,6) NOT NULL
+		) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8');
+
+
+		$address_field = Configuration::get('PS_TAX_ADDRESS_TYPE');
+		$sql = 'SELECT `id_order`
+					FROM `'._DB_PREFIX_.'orders` o
+					LEFT JOIN `'._DB_PREFIX_.'address` a ON (a.`id_address` = o.`'.bqSQL($address_field).'`)
+					LEFT JOIN `'._DB_PREFIX_.'country` c ON (c.`id_country` = a.`id_country`)
+					WHERE c.`iso_code` = "CA"';
+
+		$id_order_list = Db::getInstance()->ExecuteS($sql);
+
+		$values = '';
+		foreach ($id_order_list as $id_order)
+		{
+			$amount = array();
+			$id_order = $id_order['id_order'];
+			$order = new Order((int)$id_order);
+			if (!Validate::isLoadedObject($order))
+				continue;
+
+			$products = $order->getProducts();
+			foreach ($products as $product)
+			{
+				if (!array_key_exists($product['tax_name'], $amount))
+					$amount[$product['tax_name']] = array('amount' => 0, 'rate' => $product['tax_rate']);
+
+				if ($order->getTaxCalculationMethod() == PS_TAX_EXC)
+				{
+					$total_product = $product['product_price'] * $product['product_quantity'];
+					$amount_tmp = Tools::ps_round($total_product * ($product['tax_rate'] / 100), 2);
+					$amount[$product['tax_name']]['amount'] += Tools::ps_round($total_product * ($product['tax_rate'] / 100), 2);
+				}
+				else
+				{
+					$total_product = $product['product_price'] * $product['product_quantity'];
+					$amount_tmp = Tools::ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))), 2);
+					$amount[$product['tax_name']]['amount'] += Tools::ps_round($total_product - ($total_product / (1 + ($product['tax_rate'] / 100))), 2);
+				}
+			}
+
+			foreach ($amount as $tax_name => $tax_infos)
+					$values .= '('.(int)$order->id.', \''.pSQL($tax_name).'\', \''.pSQL($tax_infos['rate']).'\', '.(float)$tax_infos['amount'].'),';
+			unset($order);
+		}
+
+		if (!empty($values))
+		{
+			$values = rtrim($values, ",");
+
+			Db::getInstance()->Execute('
+			INSERT INTO `'._DB_PREFIX_.'order_tax` (id_order, tax_name, tax_rate, amount)
+			VALUES '.$values);
+		}
+	}
+}
+
@@ -380,14 +380,18 @@ CREATE TABLE `PREFIX_cms_category_lang` (
  KEY `category_name` (`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

-CREATE TABLE `PREFIX_compare_product` (
-  `id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `id_product` int(10) unsigned NOT NULL,
-  `id_guest` int(10) unsigned NOT NULL,
+CREATE TABLE `PREFIX_compare` (
+  `id_compare` int(10) unsigned NOT NULL auto_increment,
  `id_customer` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id_compare`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
+CREATE TABLE `PREFIX_compare_product` (
+  `id_compare` int(10) unsigned NOT NULL,
+  `id_product` int(10) unsigned NOT NULL,
  `date_add` datetime NOT NULL,
  `date_upd` datetime NOT NULL,
-  PRIMARY KEY  (`id_compare_product`)
+  PRIMARY KEY (`id_compare`,`id_product`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

 CREATE TABLE `PREFIX_configuration` (
@@ -1095,6 +1099,12 @@ CREATE TABLE `PREFIX_order_detail` (
  KEY `id_order_id_order_detail` (`id_order`, `id_order_detail`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

+CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
+  `id_order` int(11) NOT NULL,
+  `tax_name` varchar(40) NOT NULL,
+  `tax_rate` decimal(6,3) NOT NULL,
+  `amount` decimal(20,6) NOT NULL
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

 CREATE TABLE `PREFIX_order_cart_rule` (
  `id_order_cart_rule` int(10) unsigned NOT NULL auto_increment,
@@ -1544,7 +1554,7 @@ CREATE TABLE `PREFIX_specific_price` (
 	`id_group` INT UNSIGNED NOT NULL,
 	`id_product_attribute` INT UNSIGNED NOT NULL,
 	`price` DECIMAL(20, 6) NOT NULL,
-	`from_quantity` SMALLINT UNSIGNED NOT NULL,
+	`from_quantity` mediumint(8) UNSIGNED NOT NULL,
 	`reduction` DECIMAL(20, 6) NOT NULL,
 	`reduction_type` ENUM('amount', 'percentage') NOT NULL,
 	`from` DATETIME NOT NULL,
@@ -1668,8 +1678,8 @@ CREATE TABLE `PREFIX_store` (
  `address2` varchar(128) DEFAULT NULL,
  `city` varchar(64) NOT NULL,
  `postcode` varchar(12) NOT NULL,
-  `latitude` decimal(10,8) DEFAULT NULL,
-  `longitude` decimal(10,8) DEFAULT NULL,
+  `latitude` decimal(11,8) DEFAULT NULL,
+  `longitude` decimal(11,8) DEFAULT NULL,
  `hours` varchar(254) DEFAULT NULL,
  `phone` varchar(16) DEFAULT NULL,
  `fax` varchar(16) DEFAULT NULL,
@@ -1857,6 +1867,12 @@ PRIMARY KEY (`id_carrier`, `id_shop`),
  KEY `id_shop` (`id_shop`)
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;

+CREATE TABLE `PREFIX_address_format` (
+  `id_country` int(10) unsigned NOT NULL,
+  `format` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id_country`)
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+
 CREATE TABLE `PREFIX_cms_shop` (
 `id_cms` INT( 11 ) UNSIGNED NOT NULL,
 `id_shop` INT( 11 ) UNSIGNED NOT NULL ,
@@ -2235,4 +2251,4 @@ CREATE TABLE `PREFIX_accounting_product_zone_shop` (
  `account_number` varchar(64) NOT NULL,
  PRIMARY KEY (`id_accounting_product_zone_shop`),
  UNIQUE KEY `id_product` (`id_product`,`id_shop`,`id_zone`)
-) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
@@ -72,7 +72,7 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES (3,
 (35, 33, 2),(36, 33, 3),(37, 33, 4),(39, 37, 1),(40, 32, 8),(41, 32, 9),(42, 32, 10),(43, 32, 11),(42, 14, 6),(43, 14, 7),(44, 32, 12),(45, 32, 13),(46, 32, 15),
 (47, 32, 14),(48, 32, 16),(49, 32, 17),(55, 32, 22),(50, 32, 18),(51, 32, 19),(51, 45, 1),(25, 25, 1),(41, 20, 2),(52, 32, 20),(53, 32, 21),(17, 9, 2),(18, 9, 3),(24, 9, 4),(9, 9, 5),
 (15, 9, 6),(5, 9, 7),(8, 9, 8),(10, 9, 9),(20, 9, 10),(11, 9, 11),(16, 9, 12),(22, 9, 13),(13, 9, 14),(14, 9, 15),(12, 9, 16),(7, 9, 17),(21, 9, 18),(10, 60, 1),(10, 61, 1),(10, 62, 1),
-(54, 9, 19),(10,66,1);
+(54, 9, 19),(10,66,1),(19,9,20);

 CREATE TABLE `PREFIX_pagenotfound` (
  `id_pagenotfound` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -866,6 +866,85 @@ INSERT INTO `PREFIX_search_word` (`id_word`, `id_lang`, `word`) VALUES (1, 1, 'i

 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 2, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);
 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) VALUES
+(2, 1, 1, 1, 1, 1),
+(2, 2, 1, 1, 1, 1),
+(2, 3, 1, 1, 1, 1),
+(2, 4, 0, 0, 0, 0),
+(2, 5, 1, 1, 1, 1),
+(2, 6, 0, 0, 0, 0),
+(2, 7, 0, 0, 0, 0),
+(2, 8, 0, 0, 0, 0),
+(2, 9, 0, 0, 0, 0),
+(2, 10, 0, 0, 0, 0),
+(2, 11, 0, 0, 0, 0),
+(2, 12, 1, 1, 1, 1),
+(2, 13, 1, 1, 1, 1),
+(2, 14, 0, 0, 0, 0),
+(2, 15, 0, 0, 0, 0),
+(2, 16, 0, 0, 0, 0),
+(2, 17, 1, 1, 1, 1),
+(2, 18, 0, 0, 0, 0),
+(2, 19, 0, 0, 0, 0),
+(2, 20, 1, 1, 1, 1),
+(2, 21, 1, 1, 1, 1),
+(2, 22, 0, 0, 0, 0),
+(2, 23, 0, 0, 0, 0),
+(2, 24, 0, 0, 0, 0),
+(2, 26, 0, 0, 0, 0),
+(2, 27, 0, 0, 0, 0),
+(2, 28, 0, 0, 0, 0),
+(2, 29, 0, 0, 0, 0),
+(2, 30, 0, 0, 0, 0),
+(2, 31, 0, 0, 0, 0),
+(2, 32, 0, 0, 0, 0),
+(2, 33, 0, 0, 0, 0),
+(2, 34, 1, 1, 1, 1),
+(2, 35, 0, 0, 0, 0),
+(2, 36, 0, 0, 0, 0),
+(2, 37, 0, 0, 0, 0),
+(2, 38, 0, 0, 0, 0),
+(2, 39, 0, 0, 0, 0),
+(2, 40, 0, 0, 0, 0),
+(2, 41, 0, 0, 0, 0),
+(2, 42, 1, 1, 1, 1),
+(2, 43, 0, 0, 0, 0),
+(2, 44, 0, 0, 0, 0),
+(2, 46, 0, 0, 0, 0),
+(2, 47, 1, 1, 1, 1),
+(2, 48, 0, 0, 0, 0),
+(2, 49, 1, 1, 1, 1),
+(2, 51, 0, 0, 0, 0),
+(2, 52, 0, 0, 0, 0),
+(2, 53, 0, 0, 0, 0),
+(2, 54, 0, 0, 0, 0),
+(2, 55, 1, 1, 1, 1),
+(2, 56, 0, 0, 0, 0),
+(2, 57, 0, 0, 0, 0),
+(2, 58, 0, 0, 0, 0),
+(2, 59, 1, 1, 1, 1),
+(2, 60, 1, 1, 1, 1),
+(2, 61, 0, 0, 0, 0),
+(2, 62, 0, 0, 0, 0),
+(2, 63, 0, 0, 0, 0),
+(2, 64, 0, 0, 0, 0),
+(2, 65, 0, 0, 0, 0),
+(2, 66, 0, 0, 0, 0),
+(2, 67, 0, 0, 0, 0),
+(2, 68, 0, 0, 0, 0),
+(2, 69, 0, 0, 0, 0),
+(2, 70, 0, 0, 0, 0),
+(2, 71, 0, 0, 0, 0),
+(2, 72, 0, 0, 0, 0),
+(2, 73, 1, 1, 1, 1),
+(2, 80, 0, 0, 0, 0),
+(2, 81, 0, 0, 0, 0),
+(2, 82, 0, 0, 0, 0),
+(2, 83, 0, 0, 0, 0),
+(2, 84, 0, 0, 0, 0),
+(2, 85, 0, 0, 0, 0),
+(2, 86, 0, 0, 0, 0),
+(2, 87, 0, 0, 0, 0),
+(2, 88, 1, 1, 1, 1),
 (3, 1, 1, 1, 1, 1),
 (3, 2, 1, 1, 1, 1),
 (3, 3, 1, 1, 1, 1),
@@ -945,7 +1024,6 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
 (3, 86, 0, 0, 0, 0),
 (3, 87, 0, 0, 0, 0),
 (3, 88, 0, 0, 0, 0),
-(3, 89, 0, 0, 0, 0),
 (3, 90, 0, 0, 0, 0),
 (3, 91, 0, 0, 0, 0),
 (3, 92, 0, 0, 0, 0),
@@ -1041,6 +1119,7 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
 (4, 85, 0, 0, 0, 0),
 (4, 86, 0, 0, 0, 0),
 (4, 87, 0, 0, 0, 0),
+<<<<<<< .working
 (4, 88, 0, 0, 0, 0),
 (4, 89, 0, 0, 0, 0),
 (4, 90, 0, 0, 0, 0),
@@ -1156,7 +1235,9 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
 (5, 103, 1, 1, 1, 1),
 (5, 104, 1, 1, 1, 1),
 (5, 105, 0, 0, 0, 0),
-(5, 106, 0, 0, 0, 0);
+(5, 106, 0, 0, 0, 0),
+(4, 88, 1, 1, 1, 1);
+>>>>>>> .merge-right.r10309

 INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 2, id_module, 0, 1 FROM PREFIX_module);
 INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 3, id_module, 0, 1 FROM PREFIX_module);
@@ -1052,8 +1052,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
 (4, 5, 'Versandkosten'),(4, 6, 'Statistik'),(4, 7, 'Module'),(4, 8, 'Voreinstellungen'),(4, 9, 'Tools'),(4, 10, 'Hersteller'),(4, 11, 'Attribute und Gruppen'),
-(4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Lieferanten'),(4, 18, 'Länder'),
-(4, 19, 'Zonen'),(4, 20, 'Preislagen'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'),
+(4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Versanddienst'),(4, 18, 'Länder'),
+(4, 19, 'Zonen'),(4, 20, 'Preisspanne'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'),
 (4, 27, 'Produkte'),(4, 28, 'Kontakte'),(4, 29, 'Mitarbeiter'),(4, 30, 'Profile'),(4, 31, 'Berechtigungen'),(4, 32, 'Sprachen'),(4, 33, 'Übersetzungen'),
 (4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Themen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Alias'),
 (4, 41, 'Import'),(4, 42, 'Rechnungen'),(4, 43, 'Suche'),(4, 44, 'Lokalisierung'),(4, 46, 'Staaten'),(4, 47, 'Warenrücksendungen'),(4, 48, 'PDF'),
@@ -1061,6 +1061,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 55, 'Lieferscheine'),(4, 56, 'SEO & URLs'),(4, 57, 'CMS'),(4, 58, 'Image Mapping'),(4, 59, 'Kundennachrichten'),(4, 60, 'Tracking'),
 (4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'),
 (4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'),
+<<<<<<< .working
 (4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'),
 (4, 87,'Home'), (4, 88, 'Shops'), (4, 89, 'Group Shops'), (4, 90, 'Shop Urls'),(4, 91, 'Genders'),(4, 92, 'SQL Manager'),
 (4, 93, 'Products'),
@@ -0,0 +1,25 @@
+SET NAMES 'utf8';
+
+/* PHP:update_order_canada(); */;
+
+CREATE TABLE IF NOT EXISTS `PREFIX_compare` (
+  `id_compare` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id_customer` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id_compare`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+ALTER TABLE  `PREFIX_compare_product` DROP  `id_compare_product` , DROP  `id_guest` , DROP  `id_customer` ;
+
+ALTER TABLE `PREFIX_compare_product`
+	ADD `id_compare` int(10) unsigned NOT NULL,
+   ADD PRIMARY KEY(
+     `id_compare`,
+     `id_product`);
+
+ALTER TABLE `PREFIX_store` CHANGE `latitude` `latitude` DECIMAL(11, 8) NULL DEFAULT NULL;
+ALTER TABLE `PREFIX_store` CHANGE `longitude` `longitude` DECIMAL(11, 8) NULL DEFAULT NULL;
+
+ALTER TABLE `PREFIX_address_format` ADD PRIMARY KEY (`id_country`);
+ALTER TABLE `PREFIX_address_format` DROP INDEX `country`;
+
+/* PHP:hook_blocksearch_on_header(); */;
@@ -141,6 +141,10 @@ require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_feature_detachable_cache.php

 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'add_accounting_tab.php');

+require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'hook_blocksearch_on_header.php');
+
+require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'update_order_canada.php');
+
 //old version detection
 global $oldversion, $logger;
 $oldversion = false;