From 7095168648ba10fe246c5cf305377ae1209a41fe Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 17:46:52 +0530
Subject: [PATCH 1/2] [IMP]: Changed sequences of all main menus.

bzr revid: uco@tinyerp.com-20100617121652-5n6zb5zbk07pztn3
---
 addons/account/account_menuitem.xml                           | 2 +-
 .../account_analytic_analysis_menu.xml                        | 2 +-
 addons/account_budget/crossovered_budget_view.xml             | 2 +-
 addons/auction/auction_view.xml                               | 2 +-
 addons/base_contact/base_contact_view.xml                     | 2 +-
 addons/base_report_designer/base_report_designer_wizard.xml   | 2 +-
 addons/board/board_view.xml                                   | 2 +-
 addons/document/document_view.xml                             | 2 +-
 addons/email_template/email_template_account_view.xml         | 2 +-
 addons/hr/hr_view.xml                                         | 2 +-
 addons/hr_attendance/hr_attendance_wizard.xml                 | 2 +-
 .../report/hr_timesheet_invoice_report_view.xml               | 4 ++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml         | 2 +-
 addons/idea/idea_view.xml                                     | 2 +-
 addons/lunch/lunch_view.xml                                   | 2 +-
 addons/marketing/marketing_view.xml                           | 2 +-
 .../marketing_campaign_mailchimp_view.xml                     | 2 +-
 addons/membership/membership_view.xml                         | 2 +-
 addons/mrp/mrp_view.xml                                       | 2 +-
 addons/olap/data/olap_view.xml                                | 2 +-
 addons/point_of_sale/pos_view.xml                             | 2 +-
 addons/project/project_view.xml                               | 2 +-
 addons/project_issue/report/project_issue_report_view.xml     | 2 +-
 addons/project_long_term/project_long_term_view.xml           | 2 +-
 addons/purchase/purchase_view.xml                             | 2 +-
 addons/stock/stock_view.xml                                   | 2 +-
 addons/subscription/subscription_view.xml                     | 2 +-
 addons/survey/survey_view.xml                                 | 2 +-
 addons/wiki/wiki_view.xml                                     | 2 +-
 29 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 4cdcb7787b6..01cecfb8105 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 821f7180e2e..772c01ab07c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
 <!--        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
         <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
 
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index e7a0faf069d..06b889d2cee 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -316,7 +316,7 @@
             menu="False"/>-->
 
         <!--Menu for project management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_pm_invoicing" name="Billing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index c65cd6d8451..91b2d171906 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
+    <menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase" sequence="26"/>
     <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 352e8cf62d3..9050f05acaf 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -127,7 +127,7 @@
     Contacts for Suppliers
     -->
     <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
-             sequence="7"/>
+             sequence="3"/>
     <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index 8882d2de9e9..713dab37d48 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,7 +8,7 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
-		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="30"/>
     	<menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index ad397ac518e..a1dd41ae5ae 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-graph" id="base.reporting_menu"
-            name="Reporting" sequence="8" />
+            name="Reporting" sequence="30" />
 
  <!--Board Note Tree View  -->
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 56d96d916ca..29f3617d64f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="4" groups="base.group_user"/>
+    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="base.group_user"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 9a35328b25c..8d9a9549664 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
         <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4adb8c3488b..f6add4a07ed 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -5,7 +5,7 @@
             id="menu_hr_root"
             icon="terp-hr"
             name="Human Resources"
-            sequence="6"/>
+            sequence="15"/>
         <menuitem
             id="menu_hr_main"
             parent="menu_hr_root"
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index 717495b654e..dad6a918447 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,7 +12,7 @@
       <!--  <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>-->
         <!--Time Tracking menu for Project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 602204fd4e8..c9fed4d3e33 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -493,8 +493,8 @@
          <menuitem
                 icon="terp-project"
                 id="base.menu_main_pm"
-                name="Project Management"
-                sequence="1"/>
+                name="Project"
+                sequence="10"/>
          <menuitem
                 id="base.menu_project_management_time_tracking"
                 name="Time Tracking"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6bd5d20567d..487e3687b36 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -223,7 +223,7 @@
         </record>
 
         <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index ca46b31ace8..fe1022b9d5c 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -3,7 +3,7 @@
     <data>
 
     <!-- Idea Category Form View -->
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index ab3d6792683..7d494a6be06 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
           <menuitem name="Lunch Order" parent="base.menu_tools"
               id="menu_lunch" sequence="1" />
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 800b85f7c49..64ea6111bd5 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
+        <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="17"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index f2151d8d820..ca4d8efd40c 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -47,7 +47,7 @@
     ================================================================
     -->
 
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
     <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
 
     <record model="ir.ui.view" id="view_mailchimp_account_tree">
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index c937ffabf78..142e27c1337 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -81,7 +81,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Membership" id="menu_membership" icon="terp-crm"/>
+        <menuitem name="Membership" id="menu_membership" icon="terp-crm" sequence="25"/>
         <menuitem name="Members" parent="menu_membership"
             id="menu_member"
             sequence="1"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ef0b9a1adc7..5eb86e77c49 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager" sequence="3"/>
+            groups="group_mrp_user,group_mrp_manager" sequence="8"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index cfd326cbce3..17995cceacf 100644
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="30"/>
 
     <menuitem
             id="base.next_id_50"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 22e46933365..8ab8ced00fe 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="21"
             icon="terp-partner"
             groups="group_pos_manager,group_pos_user"/>
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 04ee0b42df0..cbb7b9d7337 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c422d987db5..47ae02005f2 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -172,7 +172,7 @@
 	        <field name="view_id" ref="view_project_issue_report_graph"/>
 	        <field name="act_window_id" ref="action_project_issue_report"/>
 	    </record>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
 
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index a63449abf85..93f74329433 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -297,7 +297,7 @@
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
-        <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
+        <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 960ce52d5d4..814009529e7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -4,7 +4,7 @@
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
-            groups="group_purchase_user" sequence="7"/>
+            groups="group_purchase_user" sequence="3"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
         
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6f5ef15f900..50b06839bd3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="5"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="7"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 84c7c41207a..2c53f02a447 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 
         <!--
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index bd3f257c756..86aa52e6810 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
                  groups="group_survey_manager"
                  parent="base.menu_tools" />
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 8f07148fd52..189122ea617 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
        <menuitem name="Knowledge Management" icon="terp-stock"
-           id="base.menu_document" sequence="4" />
+           id="base.menu_document" sequence="19" />
 
        <menuitem name="Configuration"
            id="base.menu_document_configuration"

From 2b7a3224708ffaa823e311d331fbc89dfc5ed86d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 19:14:20 +0530
Subject: [PATCH 2/2] [IMP]: Re-organized Tools menu structure.

bzr revid: uco@tinyerp.com-20100617134420-52257h3u0w6y7iux
---
 addons/email_template/email_template_account_view.xml    | 5 +++--
 addons/idea/idea_view.xml                                | 8 ++++----
 addons/lunch/lunch_view.xml                              | 4 ++--
 .../marketing_campaign_mailchimp_view.xml                | 2 +-
 addons/subscription/subscription_view.xml                | 2 +-
 addons/survey/survey_view.xml                            | 9 ++++++---
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 8d9a9549664..65973fea9f7 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -3,7 +3,8 @@
     <data>
 
         <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
+        <menuitem name="Emails" id="base.menu_emails" parent="base.menu_tools" sequence="5"/>
+        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
 
         <record model="ir.ui.view" id="email_template_account_form">
             <field name="name">email_template.account.form</field>
@@ -95,7 +96,7 @@
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
-        <menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" />
+        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fe1022b9d5c..d24ad041fee 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -44,9 +44,9 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="6"/>
+         id="base.menu_lunch_survey_root" sequence="20"/>
 
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
 
@@ -356,9 +356,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
 
-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
         id="menu_idea_vote_stat" action="action_idea_vote_stat" />
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7d494a6be06..aec0d877c18 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
               id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="5" />
+              id="base.menu_lunch_reporting" sequence="6" />
 
           <menuitem name="Lunch Orders"
               parent="base.menu_lunch_reporting"
               id="menu_lunch_reporting_order" sequence="1" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="6" />
+              id="base.menu_lunch_survey_root" sequence="20" />
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
               id="menu_lunch_category_root_configuration" sequence="1" />
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index ca4d8efd40c..ea9fba18384 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -48,7 +48,7 @@
     -->
 
     <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
+    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_emails" />
 
     <record model="ir.ui.view" id="view_mailchimp_account_tree">
         <field name="name">mailchimp.account.tree</field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 2c53f02a447..478bb4a4f67 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
+        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!--
         =======================================================
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 86aa52e6810..e2643b127b7 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,15 @@
     <data>
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
+            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" 
+                        groups="group_survey_manager,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
                  groups="group_survey_manager"
-                 parent="base.menu_tools" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="base.menu_tools" groups="group_survey_manager,group_survey_user"/>
+                 parent="menu_surveys" />
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="group_survey_manager,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="menu_reporting" groups="group_survey_manager"/>
+                id="base.menu_lunch_reporting" groups="group_survey_manager" sequence="6"/>
+            <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
         -->