diff --git a/install-new/langs/de/data/supply_order_state.xml b/install-new/langs/de/data/supply_order_state.xml index 735359ce0..cb1ee8eb7 100644 --- a/install-new/langs/de/data/supply_order_state.xml +++ b/install-new/langs/de/data/supply_order_state.xml @@ -16,6 +16,6 @@ Order received completely - order fenced + order canceled diff --git a/install-new/langs/en/data/supply_order_state.xml b/install-new/langs/en/data/supply_order_state.xml index 70c6d14f2..fb261942a 100644 --- a/install-new/langs/en/data/supply_order_state.xml +++ b/install-new/langs/en/data/supply_order_state.xml @@ -16,6 +16,6 @@ Order received completely - order fenced + order canceled diff --git a/install-new/langs/es/data/supply_order_state.xml b/install-new/langs/es/data/supply_order_state.xml index 735359ce0..cb1ee8eb7 100644 --- a/install-new/langs/es/data/supply_order_state.xml +++ b/install-new/langs/es/data/supply_order_state.xml @@ -16,6 +16,6 @@ Order received completely - order fenced + order canceled diff --git a/install-new/langs/fr/data/supply_order_state.xml b/install-new/langs/fr/data/supply_order_state.xml index 3c70f888b..8ceea5ea0 100644 --- a/install-new/langs/fr/data/supply_order_state.xml +++ b/install-new/langs/fr/data/supply_order_state.xml @@ -16,6 +16,6 @@ Commande réceptionnée totalement - Commande cloturée + Commande annulée diff --git a/install-new/langs/it/data/supply_order_state.xml b/install-new/langs/it/data/supply_order_state.xml index 735359ce0..cb1ee8eb7 100644 --- a/install-new/langs/it/data/supply_order_state.xml +++ b/install-new/langs/it/data/supply_order_state.xml @@ -16,6 +16,6 @@ Order received completely - order fenced + order canceled diff --git a/install-new/upgrade/sql/1.5.0.4.sql b/install-new/upgrade/sql/1.5.0.4.sql index cc4df1543..f1eeb8029 100644 --- a/install-new/upgrade/sql/1.5.0.4.sql +++ b/install-new/upgrade/sql/1.5.0.4.sql @@ -11,15 +11,6 @@ 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; - - CREATE TABLE `PREFIX_category_shop` ( `id_category` int(11) NOT NULL, `id_shop` int(11) NOT NULL, @@ -28,4 +19,4 @@ CREATE TABLE `PREFIX_category_shop` ( ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -/* PHP:generate_root_category_for_multishop(); */; \ No newline at end of file +/* PHP:generate_root_category_for_multishop(); */;