diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml index 00b2add62..477d81b3d 100644 --- a/install-dev/data/xml/tab.xml +++ b/install-dev/data/xml/tab.xml @@ -42,6 +42,9 @@ AdminPriceRule + + AdminParentShipping + AdminParentLocalization @@ -147,6 +150,15 @@ AdminMarketing + + AdminShipping + + + AdminCarriers + + + AdminCarrierWizard + AdminLocalization @@ -186,12 +198,6 @@ AdminPayment - - AdminCarriers - - - AdminCarrierWizard - AdminPreferences @@ -204,9 +210,6 @@ AdminCustomerPreferences - - AdminShipping - AdminThemes diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql index c95942e20..04d4af493 100644 --- a/install-dev/upgrade/sql/1.5.5.0.sql +++ b/install-dev/upgrade/sql/1.5.5.0.sql @@ -22,13 +22,6 @@ CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL; /* PHP:remove_tab(AdminRangePrice); */; /* PHP:remove_tab(AdminRangeWeight); */; -/* PHP:remove_tab(AdminShipping); */; -/* PHP:remove_tab(AdminParentShipping); */; -/* PHP:remove_tab(AdminCarriers); */; - -/* PHP:add_new_tab(AdminShipping, es:Shipping|it:Shipping|en:Shipping|de:Shipping|fr:Transport, 0, false, AdminParentPreferences); */; -/* PHP:add_new_tab(AdminCarriers, es:Carriers|it:Carriers|en:Carriers|de:Carriers|fr:Tarsporteurs, 0, false, AdminParentModules); */; - ALTER TABLE `PREFIX_log` ADD `id_employee` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `object_id`;