From cdcf5f72659127d2e81464a7786e6fda43fb75e4 Mon Sep 17 00:00:00 2001 From: bMancone Date: Mon, 16 Jan 2012 16:23:16 +0000 Subject: [PATCH] // Fixed #PSTEST-496 --- install-dev/sql/db_settings_lite.sql | 12 ++++++------ install-dev/sql/upgrade/1.5.0.4.sql | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index 5f4bf2314..1ce3b022b 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -1614,11 +1614,11 @@ INSERT INTO `PREFIX_supply_order_state_lang` (`id_supply_order_state`, `id_lang` (5, 3, 'Order received completely'), (5, 4, 'Order received completely'), (5, 5, 'Order received completely'), -(6, 1, 'order fenced'), -(6, 2, 'Commande cloturée'), -(6, 3, 'order fenced'), -(6, 4, 'order fenced'), -(6, 5, 'order fenced'); +(6, 1, 'order canceled'), +(6, 2, 'Commande annulée'), +(6, 3, 'order canceled'), +(6, 4, 'order canceled'), +(6, 5, 'order canceled'); INSERT INTO `PREFIX_risk` (`id_risk`, `percent`, `color`) VALUES (1, 0, 'LimeGreen'), @@ -1649,4 +1649,4 @@ INSERT INTO `PREFIX_risk_lang` (`id_risk`, `id_lang`, `name`) VALUES (4, 5, 'Hight'); INSERT INTO `PREFIX_category_shop` (`id_category`, `id_shop`) VALUES -(1, 1); \ No newline at end of file +(1, 1); diff --git a/install-dev/sql/upgrade/1.5.0.4.sql b/install-dev/sql/upgrade/1.5.0.4.sql index eaac53bef..05b91d678 100644 --- a/install-dev/sql/upgrade/1.5.0.4.sql +++ b/install-dev/sql/upgrade/1.5.0.4.sql @@ -11,3 +11,11 @@ ALTER TABLE `PREFIX_image_type` DROP `id_theme`; ALTER TABLE `PREFIX_specific_price_rule_condition` CHANGE `id_specific_price_rule_condition` `id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT; ALTER TABLE `PREFIX_specific_price_rule_condition_group` CHANGE `id_specific_price_rule_condition_group` `id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT; + +UPDATE `PREFIX_supply_order_state_lang` +SET `name` = "order canceled" +WHERE `name` = "order fenced" AND (`id_lang` = 1 OR `id_lang` = 3 OR `id_lang` = 4 OR `id_lang` = 5); + +UPDATE `PREFIX_supply_order_state_lang` +SET `name` = "Commande cloturée" +WHERE `name` = "order fenced" AND id_lang = 2;