From 188eece4e7435bc37678dcd1cd42164df6395d63 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 22 Dec 2011 18:32:00 +0000 Subject: [PATCH] // More fixes to upgrader sql --- install-dev/sql/upgrade/1.5.0.1.sql | 141 +++++++++------------------- install-dev/sql/upgrade/1.5.0.2.sql | 22 +++-- 2 files changed, 56 insertions(+), 107 deletions(-) diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql index d418b342b..d57a8ed99 100644 --- a/install-dev/sql/upgrade/1.5.0.1.sql +++ b/install-dev/sql/upgrade/1.5.0.1.sql @@ -1,5 +1,32 @@ SET NAMES 'utf8'; +CREATE TABLE IF NOT EXISTS `PREFIX_module_access` ( + `id_profile` int(10) unsigned NOT NULL, + `id_module` int(10) unsigned NOT NULL, + `view` tinyint(1) NOT NULL, + `configure` tinyint(1) NOT NULL, + PRIMARY KEY (`id_profile`,`id_module`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +INSERT INTO `PREFIX_profile` (`id_profile`) VALUES (5); + +/* Create SuperAdmin */ +UPDATE `PREFIX_profile_lang` SET `id_profile` = 5 WHERE `id_profile` = 4; +UPDATE `PREFIX_profile_lang` SET `id_profile` = 4 WHERE `id_profile` = 3; +UPDATE `PREFIX_profile_lang` SET `id_profile` = 3 WHERE `id_profile` = 2; +UPDATE `PREFIX_profile_lang` SET `id_profile` = 2 WHERE `id_profile` = 1; +INSERT INTO `PREFIX_profile_lang` (`id_profile`, `id_lang`, `name`) VALUES (1, 1, 'SuperAdmin'),(1, 2, 'SuperAdmin'),(1, 3, 'SuperAdmin'),(1, 4, 'SuperAdmin'),(1, 5, 'SuperAdmin'); +UPDATE `PREFIX_access` SET `id_profile` = 5 WHERE `id_profile` = 4; +UPDATE `PREFIX_access` SET `id_profile` = 4 WHERE `id_profile` = 3; +UPDATE `PREFIX_access` SET `id_profile` = 3 WHERE `id_profile` = 2; +UPDATE `PREFIX_access` SET `id_profile` = 2 WHERE `id_profile` = 1; +INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, `id_tab`, 1, 1, 1, 1 FROM `PREFIX_tab`); +UPDATE `PREFIX_module_access` SET `id_profile` = 5 WHERE `id_profile` = 4; +UPDATE `PREFIX_module_access` SET `id_profile` = 4 WHERE `id_profile` = 3; +UPDATE `PREFIX_module_access` SET `id_profile` = 3 WHERE `id_profile` = 2; +UPDATE `PREFIX_module_access` SET `id_profile` = 2 WHERE `id_profile` = 1; +INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 1, `id_module`, 1, 1 FROM `PREFIX_module`); + CREATE TABLE IF NOT EXISTS `PREFIX_accounting_zone_shop` ( `id_accounting_zone_shop` int(11) NOT NULL AUTO_INCREMENT, `id_zone` int(11) NOT NULL, @@ -21,27 +48,21 @@ CREATE TABLE IF NOT EXISTS `PREFIX_accounting_product_zone_shop` ( /* PHP:add_accounting_tab(); */; -CREATE TABLE IF NOT EXISTS `PREFIX_module_access` ( - `id_profile` int(10) unsigned NOT NULL, - `id_module` int(10) unsigned NOT NULL, - `view` tinyint(1) NOT NULL, - `configure` tinyint(1) NOT NULL, - PRIMARY KEY (`id_profile`,`id_module`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) ( - SELECT `id_profile`, `id_module`, 0, 1 - FROM `PREFIX_access` a, PREFIX_module m - WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` WHERE `class_name` = 'AdminModules' LIMIT 1) - AND a.`view` = 0 -); +-- INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) ( +-- SELECT `id_profile`, `id_module`, 0, 1 +-- FROM `PREFIX_access` a, PREFIX_module m +-- WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` WHERE `class_name` = 'AdminModules' LIMIT 1) +-- AND a.`view` = 0 +-- ); +-- +-- INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) ( +-- SELECT `id_profile`, `id_module`, 1, 1 +-- FROM `PREFIX_access` a, PREFIX_module m +-- WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` WHERE `class_name` = 'AdminModules' LIMIT 1) +-- AND a.`view` = 1 +-- ); -INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) ( - SELECT `id_profile`, `id_module`, 1, 1 - FROM `PREFIX_access` a, PREFIX_module m - WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` WHERE `class_name` = 'AdminModules' LIMIT 1) - AND a.`view` = 1 -); UPDATE `PREFIX_tab` SET `class_name` = 'AdminThemes' WHERE `class_name` = 'AdminAppearance'; @@ -196,11 +217,8 @@ ALTER TABLE `PREFIX_product` ADD `is_virtual` TINYINT( 1 ) NOT NULL DEFAULT '0' /* PHP:add_new_tab(AdminProducts, fr:Products|es:Products|en:Products|de:Products|it:Products, 1); */; /* PHP:add_new_tab(AdminCategories, fr:Categories|es:Categories|en:Categories|de:Categories|it:Categories, 1); */; -/* PHP:add_new_tab(AdminStocks, fr:Stocks|es:Stocks|en:Stocks|de:Stocks|it:Stocks, 1); */; /* PHP:add_default_restrictions_modules_groups(); */; - - CREATE TABLE IF NOT EXISTS `PREFIX_employee_shop` ( `id_employee` INT( 11 ) UNSIGNED NOT NULL , `id_shop` INT( 11 ) UNSIGNED NOT NULL , @@ -211,27 +229,6 @@ INSERT INTO `PREFIX_employee_shop` (`id_employee`, `id_shop`) (SELECT `id_employ UPDATE `PREFIX_access` SET `view` = 0, `add` = 0, `edit` = 0, `delete` = 0 WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminShop' LIMIT 1) AND `id_profile` != 1; -INSERT INTO `PREFIX_profile` (`id_profile`) VALUES (5); - -UPDATE `PREFIX_profile_lang` SET `id_profile` = 5 WHERE `id_profile` = 4; -UPDATE `PREFIX_profile_lang` SET `id_profile` = 4 WHERE `id_profile` = 3; -UPDATE `PREFIX_profile_lang` SET `id_profile` = 3 WHERE `id_profile` = 2; -UPDATE `PREFIX_profile_lang` SET `id_profile` = 2 WHERE `id_profile` = 1; - -INSERT INTO `PREFIX_profile_lang` (`id_profile`, `id_lang`, `name`) VALUES (1, 1, 'SuperAdmin'),(1, 2, 'SuperAdmin'),(1, 3, 'SuperAdmin'),(1, 4, 'SuperAdmin'),(1, 5, 'SuperAdmin'); - -UPDATE `PREFIX_access` SET `id_profile` = 5 WHERE `id_profile` = 4; -UPDATE `PREFIX_access` SET `id_profile` = 4 WHERE `id_profile` = 3; -UPDATE `PREFIX_access` SET `id_profile` = 3 WHERE `id_profile` = 2; -UPDATE `PREFIX_access` SET `id_profile` = 2 WHERE `id_profile` = 1; - -UPDATE `PREFIX_module_access` SET `id_profile` = 5 WHERE `id_profile` = 4; -UPDATE `PREFIX_module_access` SET `id_profile` = 4 WHERE `id_profile` = 3; -UPDATE `PREFIX_module_access` SET `id_profile` = 3 WHERE `id_profile` = 2; -UPDATE `PREFIX_module_access` SET `id_profile` = 2 WHERE `id_profile` = 1; - -INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 1, `id_module`, 1, 1 FROM `PREFIX_module`); - ALTER TABLE `PREFIX_carrier` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'; /* PHP:add_carrier_position(); */; @@ -559,61 +556,11 @@ UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminCategories& UPDATE `PREFIX_quick_access` SET `link` = 'index.php?controller=AdminProducts&addproduct' WHERE `id_quick_access` = 4; -UPDATE `PREFIX_access` SET `view` = '1' WHERE `id_profile` = 5 AND `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStock' LIMIT 1); +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1) AND `id_profile` = '3'; +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1) AND `id_profile` = '5'; -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('1', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('2', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('3', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('4', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1), 0, 0, 0, 0); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('5', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1), 0, 0, 0, 0); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminProducts' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCategories' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminAttributeGenerator' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminAccounting' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminAccountingManagement' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` ( `id_profile` , `id_tab` , `view` , `add` , `edit` , `delete` ) ( - SELECT `id_profile`, ( - SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminAccountingExport' LIMIT 1 - ), 1, 1, 1, 1 FROM `PREFIX_profile` WHERE `id_profile` != 1 AND `id_profile` != 2 -); - -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('1', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('2', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('3', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1), 0, 0, 0, 0); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('4', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('5', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCmsCategories' LIMIT 1), 0, 0, 0, 0); - -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('1', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('2', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('3', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1), 0, 0, 0, 0); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('4', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('5', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1), 0, 0, 0, 0); +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1) AND `id_profile` = '3'; +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminCms' LIMIT 1) AND `id_profile` = '5'; INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_CUSTOMER_GROUP', '1', NOW(), NOW()); diff --git a/install-dev/sql/upgrade/1.5.0.2.sql b/install-dev/sql/upgrade/1.5.0.2.sql index c4ffdeb8b..f61687e88 100644 --- a/install-dev/sql/upgrade/1.5.0.2.sql +++ b/install-dev/sql/upgrade/1.5.0.2.sql @@ -9,12 +9,6 @@ DELETE FROM `PREFIX_tab_lang` WHERE `id_tab` = 59 AND `id_lang` = 5; ALTER TABLE `PREFIX_module` ADD `version` VARCHAR( 8 ) NOT NULL; -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('1', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('2', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('3', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1), 1, 1, 1, 1); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('4', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1), 0, 0, 0, 0); -INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, edit, `delete`) VALUES ('5', (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1), 0, 0, 0, 0); - CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` ( `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` VARCHAR(255) NOT NULL, @@ -67,6 +61,14 @@ ADD INDEX `id_product` (`id_product`, `id_shop`, `id_currency`, `id_country`, `i /* PHP:add_stock_tab(); */; +UPDATE `PREFIX_access` SET `view` = '1' WHERE `id_profile` = 5 AND `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStock' LIMIT 1); + + +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1) AND `id_profile` = '4'; +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminSupplyOrders' LIMIT 1) AND `id_profile` = '5'; +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1) AND `id_profile` = '4'; +UPDATE `PREFIX_access` SET `view` = '0', `add` = '0', `edit` = '0', `delete` = '0' WHERE `id_tab` = (SELECT `id_tab` FROM `PREFIX_tab` t WHERE t.`class_name` = 'AdminStockConfiguration' LIMIT 1) AND `id_profile` = '5'; + /* New tables */ CREATE TABLE IF NOT EXISTS `PREFIX_product_supplier` ( `id_product_supplier` int(11) unsigned NOT NULL AUTO_INCREMENT, @@ -302,7 +304,7 @@ DELETE FROM `PREFIX_configuration` WHERE `name` = 'PS_PDF_FONT'; ALTER TABLE `PREFIX_order_detail` ADD `reduction_amount_tax_incl` FLOAT( 20.6 ) NOT NULL AFTER `reduction_amount` , ADD `reduction_amount_tax_excl` FLOAT( 20.6 ) NOT NULL AFTER `reduction_amount_tax_incl`, -ADD `total_price_tax_incl` DECIMAL(20, 6) NOT NULL AFTER `download_deadline`,, +ADD `total_price_tax_incl` DECIMAL(20, 6) NOT NULL AFTER `download_deadline`, ADD `total_price_tax_excl` DECIMAL(20, 6) NOT NULL AFTER `total_price_tax_incl`, ADD `unit_price_tax_incl` DECIMAL(20, 6) NOT NULL AFTER `total_price_tax_excl`, ADD `unit_price_tax_excl` DECIMAL(20, 6) NOT NULL AFTER `unit_price_tax_incl`, @@ -359,7 +361,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_linksmenutop_lang` ( ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; INSERT INTO `PREFIX_order_invoice` (`id_order`, `number`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, `note`, `date_add`) ( - SELECT `id_order`, `invoice_number`, `total_discounts_tax_excl`, `total_discounts_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, '', `invoice_date` + SELECT `id_order`, `invoice_number`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, '', `invoice_date` FROM `PREFIX_orders` WHERE `invoice_number` != 0 ); @@ -386,7 +388,7 @@ INSERT INTO `PREFIX_order_carrier` (`id_order`, `id_carrier`, `id_order_invoice` FROM `PREFIX_orders` o ); -INSERT INTO `PREFIX_order_payment` (`id_order_invoice`, `id_order`, `id_currency`, `amount`, `payment_method`, `conversion_rate`, `date_add`) VALUES ( +INSERT INTO `PREFIX_order_payment` (`id_order_invoice`, `id_order`, `id_currency`, `amount`, `payment_method`, `conversion_rate`, `date_add`) ( SELECT ( SELECT oi.`id_order_invoice` FROM `PREFIX_order_invoice` oi @@ -395,7 +397,7 @@ INSERT INTO `PREFIX_order_payment` (`id_order_invoice`, `id_order`, `id_currency FROM `PREFIX_orders` o LEFT JOIN `PREFIX_order_payment` op ON (op.`id_order` = o.`id_order`) WHERE op.`id_order_payment` IS NULL -) +); INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_SMARTY_CONSOLE', '0', NOW(), NOW(),('PS_INVOICE_MODEL', 'invoice', NOW(), NOW());