// MERGE with 1.4 r7770

install-dev/sql/upgrade/1.4.0.15.sql

@@ -1,7 +1,7 @@
 /* PHP:add_new_tab(AdminCounty, fr:Comtés|es:Condados|en:Counties|de:Counties|it:Counties,  5); */;
 
 ALTER TABLE `PREFIX_tax_rule` ADD `county_behavior` INT NOT NULL AFTER `state_behavior`;
-ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `state_behavior`;
+ALTER TABLE `PREFIX_tax_rule` ADD `id_county` INT NOT NULL AFTER `id_country`;
 
 ALTER TABLE `PREFIX_tax_rule` ADD UNIQUE (
 `id_tax_rules_group` ,

install-dev/sql/upgrade/1.4.0.17.sql

@@ -1,6 +1,6 @@
 SET NAMES 'utf8';
 
-ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL AFTER `id_stock_mvt_reason`;
+ALTER TABLE `PREFIX_stock_mvt_reason` ADD `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`;
 UPDATE `PREFIX_stock_mvt_reason` SET `sign`=-1;
 UPDATE `PREFIX_stock_mvt_reason` SET `sign`=1 WHERE `id_stock_mvt_reason`=3;
 UPDATE `PREFIX_stock_mvt_reason` SET `id_stock_mvt_reason`=`id_stock_mvt_reason`+2 ORDER BY `id_stock_mvt_reason` DESC;

install-dev/sql/upgrade/1.4.2.0.sql

@@ -12,15 +12,7 @@ ALTER TABLE `PREFIX_orders` ADD INDEX `date_add`(`date_add`);
 INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
 ('PS_STOCK_MVT_REASON_DEFAULT', 3, NOW(), NOW());
 
-INSERT IGNORE INTO `PREFIX_order_state` (`id_order_state`, `invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) VALUES (12, 0, 0, 'lightblue', 1, 0, 0);
-
-INSERT IGNORE INTO `PREFIX_order_state_lang` (`id_order_state`, `id_lang`, `name`, `template`) VALUES
-(12, 1, 'Payment remotely accepted', ''),
-(12, 2, 'Paiement à distance accepté', ''),
-(12, 3, 'Payment remotely accepted', ''),
-(12, 4, 'Payment remotely accepted', ''),
-(12, 5, 'Payment remotely accepted', '');
-
+/* PHP:add_order_state(PS_OS_WS_PAYMENT, en:Payment remotely accepted|fr:Paiement à distance accepté, 0, 0, lightblue, 1, 0, 0); */;
 /* PHP:alter_blocklink(); */;
 /* PHP:update_module_loyalty(); */;
 /* PHP:remove_module_from_hook(blockcategories, afterCreateHtaccess); */;

install-dev/sql/upgrade/1.4.3.0.sql

@@ -8,7 +8,7 @@ city
 State:name
 postcode
 Country:name' 
-WHERE id_country = (SELECT id_country FROM `PREFIX_country` WHERE `iso_code`='GB');
+WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='GB');
 
 UPDATE `PREFIX_country` SET `contains_states` = 1 WHERE `id_country` = 145;
 

install-dev/sql/upgrade/1.4.4.0.sql

@@ -0,0 +1,80 @@
+SET NAMES 'utf8';
+
+ALTER TABLE `PREFIX_image` MODIFY COLUMN `position` SMALLINT(2) UNSIGNED NOT NULL DEFAULT 0;
+
+INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
+('PS_OS_CHEQUE', '1', NOW(), NOW()),
+('PS_OS_PAYMENT', '2', NOW(), NOW()),
+('PS_OS_PREPARATION', '3', NOW(), NOW()),
+('PS_OS_SHIPPING', '4', NOW(), NOW()),
+('PS_OS_DELIVERED', '5', NOW(), NOW()),
+('PS_OS_CANCELED', '6', NOW(), NOW()),
+('PS_OS_REFUND', '7', NOW(), NOW()),
+('PS_OS_ERROR', '8', NOW(), NOW()),
+('PS_OS_OUTOFSTOCK', '9', NOW(), NOW()),
+('PS_OS_BANKWIRE', '10', NOW(), NOW()),
+('PS_OS_PAYPAL', '11', NOW(), NOW()),
+('PS_OS_WS_PAYMENT', '12', NOW(), NOW()),
+('PS_IMAGE_QUALITY', 'jpg', NOW(), NOW()),
+('PS_PNG_QUALITY', '7', NOW(), NOW()),
+('PS_JPEG_QUALITY', '90', NOW(), NOW()),
+('PS_COOKIE_LIFETIME_FO', '480', NOW(), NOW()),
+('PS_COOKIE_LIFETIME_BO', '480', NOW(), NOW());
+
+ALTER TABLE `PREFIX_lang` ADD `is_rtl` TINYINT(1) NOT NULL DEFAULT '0';
+
+UPDATE `PREFIX_country_lang`
+SET `name` = 'United State'
+WHERE `name` = 'USA'
+AND `id_lang` = (
+	SELECT `id_lang`
+	FROM `PREFIX_lang`
+	WHERE `iso_code` = 'en'
+	LIMIT 1
+);
+
+UPDATE `PREFIX_hook`
+SET `live_edit` = 1
+WHERE `name` = 'leftColumn'
+OR `name` = 'home'
+OR `name` = 'rightColumn'
+OR `name` = 'productfooter'
+OR `name` = 'payment';
+
+ALTER TABLE `PREFIX_stock_mvt_reason` MODIFY `sign` TINYINT(1) NOT NULL DEFAULT '1' AFTER `id_stock_mvt_reason`;
+
+UPDATE `PREFIX_tab_lang`
+SET `name` = 'Geolocation'
+WHERE `name` = 'Geolocalization';
+
+UPDATE `PREFIX_tab_lang`
+SET `name` = 'Counties'
+WHERE `name` = 'County';
+
+ALTER TABLE `PREFIX_tax_rule` MODIFY `id_county` INT NOT NULL AFTER `id_country`;
+
+UPDATE `PREFIX_address_format` set `format`='firstname lastname
+company
+address1 address2
+city, State:name postcode 
+Country:name
+phone' 
+WHERE `id_country` = (SELECT `id_country` FROM `PREFIX_country` WHERE `iso_code`='US');
+
+ALTER TABLE `PREFIX_attachment` CHANGE `mime` `mime` VARCHAR(128) NOT NULL;
+
+CREATE TABLE IF NOT EXISTS `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,
+  `id_customer` int(10) unsigned NOT NULL,
+  `date_add` datetime NOT NULL,
+  `date_upd` datetime NOT NULL,
+  PRIMARY KEY  (`id_compare_product`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+DELETE FROM `PREFIX_configuration` WHERE name = 'PS_LAYERED_NAVIGATION_CHECKBOXES' LIMIT 1;
+
+/* PHP:add_new_tab(AdminUpgrade, en:Upgrade|fr:Mise à jour,  9); */;
+
+/* PHP:alter_productcomments_guest_index(); */;

install-dev/sql/upgrade/index.php

@@ -0,0 +1,36 @@
+<?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
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;