From c210cd3e3bddb18322d90d96b64a57ed8e957bfd Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 27 May 2015 11:18:59 +0200
Subject: [PATCH] [IMP] Reorganize menuitem into coherent block instead of
 ordering them alphabetically Bloc Simple apps 1 Chat 2 Agenda 3 Notes 4
 Contacts

Bloc Sales apps
5 Sales
10 Lead Automation
15 Members
20 Point of Sale
25 Purchases

Bloc Operation apps
30 Warehouse
35 Manufacturing

Bloc Accounting app
40 Accouting/Invoicing
45 Payroll

Bloc Project
50 Project
55 Timesheets

Bloc Marketing
60 Mass Mailing
65 Events
70 Surveys

Block HR
75 Employees
80 Recruitment
85 Appraisal
90 Attendances
95 Leaves
100 Expenses
105 Lunch
110 Equipments
115 Fleet

Bloc Website
200 Website
205 Live Chat
210 Versionning
215 Website Admin

Bloc Settings
300 Knowledge (Hidden if not base.group_configuration)
305 Dashboards
310 Modules
500 Settings
---
 addons/account/views/account_menuitem.xml       |  2 +-
 addons/account/views/res_config_view.xml        |  2 --
 .../account_accountant_data.xml                 |  2 +-
 .../account_analytic_analysis_view.xml          |  2 +-
 addons/association/profile_association.xml      |  2 +-
 addons/document/document_view.xml               |  2 +-
 addons/event/event_view.xml                     |  2 +-
 addons/fleet/fleet_view.xml                     |  2 +-
 addons/hr/hr_view.xml                           |  2 +-
 addons/hr_attendance/hr_attendance_view.xml     |  4 ++--
 .../hr_equipment/views/hr_equipment_views.xml   |  6 +++---
 addons/hr_evaluation/hr_evaluation_view.xml     |  2 +-
 addons/hr_expense/hr_expense_view.xml           |  2 +-
 .../report/hr_expense_report_view.xml           | 17 +++++++++++++++++
 addons/hr_holidays/hr_holidays_view.xml         |  2 +-
 addons/hr_payroll/hr_payroll_view.xml           |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml   |  2 +-
 .../views/im_livechat_channel_views.xml         |  2 +-
 addons/knowledge/knowledge_view.xml             |  5 +----
 addons/lunch/views/lunch_views.xml              |  2 +-
 .../marketing_campaign_view.xml                 |  2 +-
 addons/marketing_campaign/res_config.xml        |  5 +++--
 addons/mass_mailing/views/mass_mailing.xml      |  2 +-
 .../mass_mailing/views/mass_mailing_report.xml  |  2 +-
 addons/membership/membership_view.xml           |  2 +-
 addons/mrp/mrp_view.xml                         |  2 +-
 addons/point_of_sale/point_of_sale_view.xml     |  2 +-
 addons/product/product_view.xml                 |  2 +-
 addons/project/project_view.xml                 |  2 +-
 addons/purchase/purchase_view.xml               |  2 +-
 addons/stock/stock_view.xml                     |  2 +-
 addons/survey/views/survey_views.xml            |  2 +-
 addons/website/data/data.xml                    |  2 +-
 addons/website/views/res_config.xml             |  2 +-
 addons/website_crm_score/views/reporting.xml    |  2 +-
 addons/website_version/views/marketing_view.xml |  2 +-
 openerp/addons/base/base_menu.xml               |  4 ++--
 37 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 099361ccacf..b8d055271d1 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -7,7 +7,7 @@
             id="menu_finance"
             groups="group_account_user,group_account_manager,group_account_invoice"
             icon="fa-usd"
-            sequence="25"/>
+            sequence="40"/>
 
         <menuitem id="menu_finance_receivables" name="Sales" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Purchases" parent="menu_finance" sequence="3"/>
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index ae5d13e910a..579326a915f 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -285,8 +285,6 @@
 
         <menuitem id="menu_account_config" name="Settings" parent="menu_finance_configuration"
             sequence="0" action="action_account_config" groups="base.group_configuration"/>
-        <menuitem id="base.menu_account_general_settings" name="Settings" parent="base.menu_account_config"
-            sequence="0" action="action_account_config"/>
 
     </data>
 </openerp>
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index f5dcfa7a545..f5f81f3679c 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -6,7 +6,7 @@
         <menuitem name="Accounting"
             icon="fa-book"
             id="account.menu_finance"
-            sequence="25"/>
+            sequence="40"/>
         <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0" groups="base.group_configuration"/>
 
     </data>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index e8145fe29fc..1b1a9f786a4 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -270,7 +270,7 @@
                 </p>
             </field>
         </record>
-        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="3"/>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="5"/>
         <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="8" parent="base.menu_sales"/>
 
         <!-- Action Sales/Invoicing/Time and Material to Invoice -->
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 8adb10e2904..76a01259977 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -7,7 +7,7 @@
             id="base.menu_association"
             groups="base.group_sale_salesman"
             icon="fa-group"
-            sequence="9"/>
+            sequence="15"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
         <menuitem name="Reports" id="base.menu_report_association" parent="base.menu_association" sequence="99"/>
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 458614b52c3..bb1d338ede0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
+    <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document" sequence="1"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f37c57e042e..27058212224 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!-- Main menu items -->
-        <menuitem name="Events" id="event_main_menu" sequence="15" groups="marketing.group_marketing_user"/>
+        <menuitem name="Events" id="event_main_menu" sequence="65" groups="marketing.group_marketing_user"/>
         <menuitem parent="event_main_menu" id="menu_reporting_events" sequence="99" groups="event.group_event_manager" name="Reports"/>
 
         <!-- EVENT.TYPE VIEWS -->
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 8dabf47fc45..99825594dc8 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -175,7 +175,7 @@
             </field>
         </record>
 
-        <menuitem name="Fleet" id="menu_root" sequence="26" groups="group_fleet_user" icon="fa-car"/>
+        <menuitem name="Fleet" id="menu_root" sequence="115" groups="group_fleet_user" icon="fa-car"/>
         <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
         <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
         <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d2054dad5b2..be7dfecdfdf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -7,7 +7,7 @@
             id="menu_hr_root"
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"
             icon="fa-user"
-            sequence="18"/>
+            sequence="75"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_user,base.group_configuration" sequence="50"/>
         <menuitem id="menu_hr_configuration_employees" name="Employees" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="1"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 3d8c1607f30..82bf78f02d5 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -120,10 +120,10 @@
             <field name="view_id"></field>  <!-- force empty -->
         </record>
 
-        <menuitem id="timesheet_menu_root" name="Timesheets" sequence="10" icon="fa-user" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="timesheet_menu_root" name="Timesheets" sequence="55" icon="fa-user" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="timesheet_menu_root" sequence="5" />
 
-        <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="29" groups="base.group_hr_attendance"/>
+        <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="90" groups="base.group_hr_attendance"/>
 
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance_root" sequence="20" groups="base.group_hr_attendance"/>
 
diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml
index d11e6c6eeaa..ef61997f586 100644
--- a/addons/hr_equipment/views/hr_equipment_views.xml
+++ b/addons/hr_equipment/views/hr_equipment_views.xml
@@ -128,7 +128,7 @@
         <field name="name">hr.equipment.request.tree</field>
         <field name="model">hr.equipment.request</field>
         <field name="arch" type="xml">
-            <tree string="maintenance Request" decoration-bf="message_unread==True">
+            <tree string="maintenance Request" fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="request_date" groups="base.group_no_one"/>
@@ -303,7 +303,7 @@
         <field name="name">hr.equipment.tree</field>
         <field name="model">hr.equipment</field>
         <field name="arch" type="xml">
-            <tree string="Assign To Employee"  decoration-bf="message_unread==True">
+            <tree string="Assign To Employee"  fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="employee_id" string="Employee"/>
@@ -515,7 +515,7 @@
     <menuitem
         id="menu_equipment_title"
         name="Equipments"
-        sequence="5"/>
+        sequence="110"/>
 
     <menuitem
         id="menu_equipment_configuration"
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e9cfef49eb7..9cf0a3e37ab 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -71,7 +71,7 @@
             <field name="context">{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}</field>
         </record>
 
-        <menuitem name="Appraisal" id="menu_hr_evaluation_root" sequence="25"/>
+        <menuitem name="Appraisal" id="menu_hr_evaluation_root" sequence="85"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
         <menuitem name="Configuration" id="menu_hr_evaluation_configuration" sequence="100" parent="menu_hr_evaluation_root" groups="base.group_configuration"/>
         <menuitem parent="menu_hr_evaluation_configuration" id="menu_open_view_hr_evaluation_plan_tree"
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 8c8e667932a..d62a883779a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -266,7 +266,7 @@
 
         <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" 
             action="action_approved_expense" sequence="15"/>
-        <menuitem id="menu_hr_expense_root" name="Expenses" sequence="20"/>
+        <menuitem id="menu_hr_expense_root" name="Expenses" sequence="100"/>
         <menuitem id="menu_hr_expense_configuration" name="Configuration" parent="menu_hr_expense_root"
             sequence="100" groups="base.group_configuration"/>
         <menuitem id="menu_hr_product" name="Expense Products" parent="menu_hr_expense_configuration" 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 6a52e5c7ad4..2647cce6671 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -67,6 +67,23 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
+    <record id="action_hr_expense_report_filtered" model="ir.actions.act_window">
+        <field name="name">Expenses Analysis</field>
+        <field name="res_model">hr.expense.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">pivot,graph</field>
+        <field name="context">{
+            'search_default_year':1,
+            'search_default_month':1,
+            'search_default_employee':1,
+            'search_default_department_id': [active_id],
+            'default_department_id': active_id}
+        </field>
+        <field name="search_view_id" ref="view_hr_expense_report_search"/>
+    </record>
+
+    <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_marketing_user,marketing.group_marketing_manager" 
+    sequence="10"/>
     <menuitem name="Expenses" action="action_hr_expense_report_all" id="menu_hr_expense_analysis" parent="menu_hr_expense_report" sequence="1"/>
 
 </data>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5e9b21009c6..e98d4234033 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -232,7 +232,7 @@
             </field>
         </record>
 
-        <menuitem name="Leaves" id="menu_hr_holidays_root" sequence="21"/>
+        <menuitem name="Leaves" id="menu_hr_holidays_root" sequence="95"/>
         <menuitem name="My Leaves" id="menu_hr_holidays_my_leaves" parent="menu_hr_holidays_root" sequence="1"/>
         <menuitem name="Approvals" id="menu_hr_holidays_approvals" parent="menu_hr_holidays_root" sequence="2"/>
         <menuitem name="Reports" id="menu_hr_holidays_report" parent="menu_hr_holidays_root" sequence="99"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index bca6ef02b20..9114e4bd684 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
 
-        <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="23"/>
+        <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="45"/>
         <menuitem id="menu_hr_payroll_configuration" name="Configuration" parent="menu_hr_payroll_root"
             sequence="100" groups="base.group_hr_manager,base.group_configuration"/>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 27f72b8f37c..c3685c5f880 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -502,7 +502,7 @@
     <menuitem
         name="Recruitment"
         id="menu_hr_recruitment_root"
-        sequence="19"/>
+        sequence="80"/>
 
     <menuitem id="menu_hr_recruitment_configuration" name="Configuration" parent="menu_hr_recruitment_root"
         sequence="100" groups="base.group_configuration"/>
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index d11868b0a45..f4be00b331c 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -183,7 +183,7 @@
             id="menu_livechat_root"
             name="Live Chat"
             groups="im_livechat_group_user"
-            sequence="34"/>
+            sequence="205"/>
 
         <menuitem
             id="support_channels"
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 682e292fece..adf79b7f436 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -7,10 +7,7 @@
             id="knowledge.menu_document"
             groups="base.group_system,base.group_document_user"
             icon="fa-magic"
-            sequence="116"/>
-
-        <menuitem name="Configuration" id="knowledge.menu_document_configuration"
-            parent="knowledge.menu_document" sequence="50" groups="base.group_configuration"/>
+            sequence="300"/>
 
         <menuitem name="Collaborative Content" id="knowledge.menu_document2"
            parent="knowledge.menu_document"/>
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 4d5c04b9fe4..313c3078597 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <!-- Top menu item -->
-        <menuitem id='menu_lunch' name='Lunch' sequence="24" groups="group_lunch_user" icon="fa-cutlery"/>
+        <menuitem id='menu_lunch' name='Lunch' sequence="105" groups="group_lunch_user" icon="fa-cutlery"/>
         <menuitem name="My Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" />
         <menuitem name="Manager" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
         <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager,base.group_configuration"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 1fa0d2c9e0b..f2390f04ef4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -185,7 +185,7 @@
     </record>
 
     <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_marketing_user,marketing.group_marketing_manager" 
-    sequence="3"/>
+    sequence="10"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign_root" action="action_marketing_campaign_form" sequence="1"/>
     <menuitem name="Reports" id="report_marketing_campaign" parent="menu_marketing_campaign_root" 
         sequence="99"/>
diff --git a/addons/marketing_campaign/res_config.xml b/addons/marketing_campaign/res_config.xml
index 3f8e570a7c2..d2f6755f264 100644
--- a/addons/marketing_campaign/res_config.xml
+++ b/addons/marketing_campaign/res_config.xml
@@ -31,8 +31,9 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_marketing_campaign_configuration" name="Lead Automation" parent="base.menu_config"
-            sequence="14"/>
+        <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_marketing_user,marketing.group_marketing_manager" sequence="10"/>
+        <menuitem id="menu_marketing_campaign_configuration" name="Configuration" parent="menu_marketing_campaign_root"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem id="menu_marketing_campaign_settings" name="Settings" 
             parent="menu_marketing_campaign_configuration" sequence="0" action="action_marketing_campaign_configuration"/>
 
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index eef46071299..9528a5b808d 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -10,7 +10,7 @@
         </template>
 
         <!-- Marketing / Mass Mailing -->
-        <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="14"/>
+        <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="60"/>
         <menuitem name="Mailings" id="mass_mailing_menu"
             parent="mass_mailing_menu_root" sequence="1" groups="marketing.group_marketing_user"/>
         <!-- Marketing / Configuration -->
diff --git a/addons/mass_mailing/views/mass_mailing_report.xml b/addons/mass_mailing/views/mass_mailing_report.xml
index 7ae952a9973..b838bb9481c 100644
--- a/addons/mass_mailing/views/mass_mailing_report.xml
+++ b/addons/mass_mailing/views/mass_mailing_report.xml
@@ -60,7 +60,7 @@
            <field name="help">Mass Mailing Statistics allows you to check different mailing related information like number of bounced mails, opened mails, replied mails. You can sort out your analysis by different groups to get accurate grained analysis.</field>
        </record>
 
-       <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="14"/>
+       <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="60"/>
        <menuitem name="Reports" id="menu_mass_mailing_report" sequence="99"
             parent="mass_mailing_menu_root"/>
        <menuitem name="Mass Mailing" id="menu_mass_mailing_analysis" sequence="1"
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6c6f81505b5..34dcdaee642 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -120,7 +120,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="15"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2427f3fc3e8..199d9d08532 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -7,7 +7,7 @@
             id="base.menu_mrp_root"
             groups="group_mrp_user,group_mrp_manager"
             icon="fa-wrench"
-            sequence="13"/>
+            sequence="35"/>
 
         <menuitem name="Manufacturing"
             id="menu_mrp_manufacturing"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 49659ede64e..9670da9f7a5 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -7,7 +7,7 @@
             id="menu_point_root"
             groups="group_pos_manager,group_pos_user"
             icon="fa-suitcase"
-            sequence="7"/>
+            sequence="20"/>
 
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a1dadb4452..2d3150bfe62 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -336,7 +336,7 @@
             </field>
         </record>
         
-        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="3"/>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="5"/>
         <menuitem action="product_template_action"
             id="menu_product_template_action"
             parent="base.menu_sales" sequence="4" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 548b673727e..a5be3b422e7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -7,7 +7,7 @@
             id="base.menu_main_pm"
             groups="group_project_manager,group_project_user"
             icon="fa-calendar"
-            sequence="8"/>
+            sequence="50"/>
 
         <menuitem name="Search"
             id="menu_project_management"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c1300080a26..3f4dcc58df7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -7,7 +7,7 @@
             id="base.menu_purchase_root"
             groups="group_purchase_manager,group_purchase_user"
             icon="fa-shopping-cart"
-            sequence="11"/>
+            sequence="25"/>
 
         <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1b38292c13f..e4377bb3ae5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -7,7 +7,7 @@
             id="menu_stock_root"
             groups="group_stock_manager,group_stock_user"
             icon="fa-archive"
-            sequence="12"/>
+            sequence="30"/>
 
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 7f3ae4421bd..284de9fc4a9 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -587,7 +587,7 @@
         <!-- MENU ELEMENTS -->
 
         <!-- Left menu categories-->
-        <menuitem name="Surveys" id="menu_surveys" sequence="25" groups="base.group_survey_user"/>
+        <menuitem name="Surveys" id="menu_surveys" sequence="70" groups="base.group_survey_user"/>
 
         <!-- Left menu elements: Survey -->
         <menuitem name="Surveys" id="menu_survey_form" action="action_survey_form" parent="menu_surveys" sequence="1"/>
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index 578f6992c89..5f3725e0936 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -86,7 +86,7 @@
         <record id="menu_website" model="ir.ui.menu">
             <field name="name">Website</field>
             <field name="icon">fa-home</field>
-            <field name="sequence" eval="400"/>
+            <field name="sequence" eval="200"/>
             <field name="action" ref="action_website"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index c15178d494e..f11870d671f 100644
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -109,7 +109,7 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_website_configuration" sequence="401" name="Website Admin"/>
+        <menuitem id="menu_website_configuration" sequence="215" name="Website Admin" groups="base.group_configuration"/>
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
             sequence="0" action="action_website_configuration" name="Settings"/>
 
diff --git a/addons/website_crm_score/views/reporting.xml b/addons/website_crm_score/views/reporting.xml
index 557bfeef48f..c223973cdd7 100644
--- a/addons/website_crm_score/views/reporting.xml
+++ b/addons/website_crm_score/views/reporting.xml
@@ -73,7 +73,7 @@
         </record>
 
         <!-- PageView Menu Item -->
-        <menuitem id="pageview_menu" name="Website Pages" parent="base.menu_sale_report" action="website_crm_score_pageviews" />
+        <menuitem id="pageview_menu" name="Page Views" parent="base.menu_sale_report" action="website_crm_score_pageviews" sequence="99"/>
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/website_version/views/marketing_view.xml b/addons/website_version/views/marketing_view.xml
index d1c4c6ebc72..82251ae6341 100644
--- a/addons/website_version/views/marketing_view.xml
+++ b/addons/website_version/views/marketing_view.xml
@@ -224,7 +224,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Versionning" id="menu_website_version_root" sequence="32" groups="marketing.group_marketing_user"/>
+        <menuitem name="Versionning" id="menu_website_version_root" sequence="210" groups="marketing.group_marketing_user" parent="website.menu_website_configuration"/>
         <menuitem action="action_website_view" id="menu_website_view" parent="menu_website_version_root"/>
         <menuitem action="action_version" id="menu_action_version" parent="menu_website_version_root" groups="base.group_no_one"/>
         <menuitem action="action_experiment" id="menu_action_experiment" parent="menu_website_version_root"/>
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index b26f4178b05..7be51ec2ee2 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
       <!-- Top menu item -->
-          <menuitem id="menu_board_root" name="Dashboards" sequence="35"/>
+          <menuitem id="menu_board_root" name="Dashboards" sequence="305"/>
           <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_board_root" sequence="0"/>
           <menuitem id="menu_reporting_config" name="Configuration" parent="menu_board_root" sequence="100" groups="base.group_configuration"/>
 
@@ -10,7 +10,7 @@
           id="menu_administration"
           icon="fa-gear"
           sequence="500"/>
-          <menuitem id="menu_management" name="Modules" sequence="499"/>
+          <menuitem id="menu_management" name="Modules" sequence="310"/>
           <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
           <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
           <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>