From 0da9ffa601d32bc0bf6e6585ffd47e7db7706bca Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Thu, 22 Dec 2011 21:00:11 +0000 Subject: [PATCH] // install git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11686 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/php/migrate_orders.php | 2 +- install-dev/sql/upgrade/1.5.0.2.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install-dev/php/migrate_orders.php b/install-dev/php/migrate_orders.php index 641b4678e..74e5de562 100644 --- a/install-dev/php/migrate_orders.php +++ b/install-dev/php/migrate_orders.php @@ -47,7 +47,7 @@ function migrate_orders() // create temporary tables mo_duplicateTables(); - $order_res = Db::getInstance()->execute( + $order_res = Db::getInstance()->query( 'SELECT * FROM `'._DB_PREFIX_.'orders`'); diff --git a/install-dev/sql/upgrade/1.5.0.2.sql b/install-dev/sql/upgrade/1.5.0.2.sql index 954ee8a92..0b442960b 100644 --- a/install-dev/sql/upgrade/1.5.0.2.sql +++ b/install-dev/sql/upgrade/1.5.0.2.sql @@ -341,6 +341,8 @@ CREATE TABLE `PREFIX_category_shop` ( INSERT INTO `PREFIX_category_shop` (`id_category`, `id_shop`) VALUES (1, 1); +ALTER TABLE `PREFIX_order_detail` ADD `tax_computation_method` tinyint(1) unsigned NOT NULL default '0' AFTER `product_weight`; + /* PHP:migrate_orders(); */; CREATE TABLE IF NOT EXISTS `PREFIX_linksmenutop` ( @@ -427,8 +429,6 @@ WHERE `class_name` = 'AdminAccounting'; ALTER TABLE `PREFIX_order_slip_detail` CHANGE `amount` `amount_tax_excl` DECIMAL( 10, 2 ) default NULL; ALTER TABLE `PREFIX_order_slip_detail` ADD COLUMN `amount_tax_incl` DECIMAL(10,2) default NULL AFTER `amount_tax_excl`; -ALTER TABLE `PREFIX_order_detail` ADD `tax_computation_method` tinyint(1) unsigned NOT NULL default '0' AFTER `product_weight`; - CREATE TABLE `PREFIX_webservice_account_shop` ( `id_webservice_account` INT( 11 ) UNSIGNED NOT NULL, `id_shop` INT( 11 ) UNSIGNED NOT NULL,