From ecd0f9a6376c664de22a7a2c642f916230d229db Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 26 May 2015 16:42:28 +0200
Subject: [PATCH] [IMP] Move all the configuration menus to the related module
 add a group menu_configuration in the admin rights

---
 addons/account/views/account_menuitem.xml             | 2 +-
 addons/account/views/res_config_view.xml              | 4 ++--
 addons/account_accountant/account_accountant_data.xml | 2 +-
 addons/association/profile_association.xml            | 2 +-
 addons/crm/res_config_view.xml                        | 4 ++--
 addons/event/event_view.xml                           | 4 ++--
 addons/hr/hr_view.xml                                 | 6 +++---
 addons/hr_attendance/hr_attendance_view.xml           | 2 +-
 addons/hr_equipment/views/hr_equipment_views.xml      | 8 ++++----
 addons/hr_evaluation/hr_evaluation_view.xml           | 2 +-
 addons/hr_expense/hr_expense_view.xml                 | 6 +++---
 addons/hr_holidays/hr_holidays_view.xml               | 4 ++--
 addons/hr_payroll/hr_payroll_view.xml                 | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml         | 4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml             | 4 ++--
 addons/knowledge/knowledge_view.xml                   | 2 +-
 addons/knowledge/res_config_view.xml                  | 4 ++--
 addons/lunch/views/lunch_views.xml                    | 2 +-
 addons/marketing/marketing_view.xml                   | 2 +-
 addons/mass_mailing/views/mass_mailing.xml            | 6 +++---
 addons/mass_mailing/views/res_config.xml              | 4 ++--
 addons/membership/membership_view.xml                 | 2 +-
 addons/mrp/mrp_view.xml                               | 2 +-
 addons/mrp/res_config_view.xml                        | 4 ++--
 addons/note/note_view.xml                             | 2 +-
 addons/point_of_sale/point_of_sale_view.xml           | 4 ++--
 addons/product/pricelist_view.xml                     | 4 ++--
 addons/project/project_view.xml                       | 6 +++---
 addons/purchase/purchase_view.xml                     | 2 +-
 addons/sale/res_config_view.xml                       | 4 ++--
 addons/sales_team/res_config_view.xml                 | 4 ++--
 addons/stock/res_config_view.xml                      | 4 ++--
 addons/stock/stock_view.xml                           | 4 ++--
 addons/survey/views/survey_views.xml                  | 2 +-
 addons/website/views/res_config.xml                   | 2 +-
 openerp/addons/base/base_menu.xml                     | 2 +-
 openerp/addons/base/res/res_partner_view.xml          | 4 ++--
 openerp/addons/base/security/base_security.xml        | 4 ++++
 38 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index dd5244f3a51..d10adac789b 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -13,7 +13,7 @@
         <menuitem id="menu_finance_payables" name="Purchases" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_entries" name="Adviser" parent="menu_finance" sequence="4" groups="group_account_manager"/>
         <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="5" groups="group_account_user"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager,base.group_configuration"/>
         <!-- Configuration Sub-Menu -->
         <menuitem id="account_account_menu" name="Accounting" parent="account.menu_finance_configuration" sequence="2" groups="group_account_manager" icon="fa-book"/>
         <menuitem id="account_management_menu" name="Management" parent="account.menu_finance_configuration" sequence="3" groups="group_account_manager"/>
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 25f298d7ad1..603cc93267b 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -283,8 +283,8 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="base.menu_account_config" name="Invoicing" parent="base.menu_config"
-            sequence="1"/>
+        <menuitem id="menu_account_config" name="Configuration" parent="menu_finance"
+            sequence="100" 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"/>
 
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 52e40c8f8fe..ba40a780d98 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -7,7 +7,7 @@
             icon="fa-book"
             id="account.menu_finance"
             sequence="25"/>
-        <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config" sequence="3"/>
+        <menuitem id="account.menu_account_config" name="Configuration" parent="account.menu_finance" sequence="100" groups="base.group_configuration"/>
 
     </data>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 8d206ea3974..8adb10e2904 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -8,7 +8,7 @@
             groups="base.group_sale_salesman"
             icon="fa-group"
             sequence="9"/>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100"/>
+        <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"/>
 
     </data>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 8717e53357b..86299f37464 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -67,8 +67,8 @@
             </field>
         </record>
 
-        <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base_setup.action_sale_config"/>
+        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
+            sequence="100" action="base_setup.action_sale_config" groups="base.group_configuration"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6fa082f9330..f37c57e042e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -38,8 +38,8 @@
             <field name="view_type">form</field>
         </record>
 
-        <menuitem id="menu_event_configuration" name="Event" parent="base.menu_config"
-            sequence="14"/>
+        <menuitem id="menu_event_configuration" name="Configuration" parent="event_main_menu"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem name="Events Types" id="menu_event_type" action="action_event_type" parent="menu_event_configuration" groups="base.group_no_one"/>
 
         <!-- EVENT.REGISTRATION ACTIONS -->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5f9a57d3d25..4cc43a998a3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,7 @@
             icon="fa-user"
             sequence="18"/>
         <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" sequence="50"/>
+        <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"/>
         <menuitem id="menu_hr_configuration_recruitment" name="Recruitment" parent="hr.menu_hr_configuration" groups="base.group_hr_user" sequence="2"/>
 
@@ -319,8 +319,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config"
-            sequence="15"/>
+        <menuitem id="menu_human_resources_configuration" name="Configuration" parent="menu_hr_root"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
             parent="menu_human_resources_configuration" sequence="1" groups="base.group_no_one,base.group_hr_manager"/>
 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 5832a35e0fc..75f3c54132f 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -169,7 +169,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem name="Attendance" parent="base.menu_config" id="menu_hr_attendance_config" sequence="29"/>
+        <menuitem name="Configuration" parent="menu_hr_attendance_root" id="menu_hr_attendance_config" sequence="100" groups="base.group_configuration"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" 
             parent="menu_hr_attendance_config" groups="base.group_hr_attendance" sequence="1"/>
 
diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml
index 43f7af1c72f..d11e6c6eeaa 100644
--- a/addons/hr_equipment/views/hr_equipment_views.xml
+++ b/addons/hr_equipment/views/hr_equipment_views.xml
@@ -519,10 +519,10 @@
 
     <menuitem
         id="menu_equipment_configuration"
-        name="Equipments"
-        parent="base.menu_config"
-        groups="base.group_hr_manager"
-        sequence="41"/>
+        name="Configuration"
+        parent="menu_equipment_title"
+        groups="base.group_hr_manager,base.group_configuration"
+        sequence="100"/>
 
     <menuitem
         id="menu_m_request_form"
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index ecf19e75c61..e9cfef49eb7 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -73,7 +73,7 @@
 
         <menuitem name="Appraisal" id="menu_hr_evaluation_root" sequence="25"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
-        <menuitem name="Appraisal" id="menu_hr_evaluation_configuration" sequence="22" parent="base.menu_config"/>
+        <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"
             action="open_view_hr_evaluation_plan_tree" sequence="5" groups="base.group_hr_manager"/>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 788483bdf62..8c8e667932a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -266,11 +266,11 @@
 
         <menuitem id="menu_expense_approved" parent="account.menu_finance_payables" 
             action="action_approved_expense" sequence="15"/>
-        <menuitem id="menu_hr_expense_configuration" name="Expenses" parent="base.menu_config"
-            sequence="20"/>
+        <menuitem id="menu_hr_expense_root" name="Expenses" sequence="20"/>
+        <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" 
             action="hr_expense_product" groups="base.group_hr_manager"/>
-        <menuitem id="menu_hr_expense_root" name="Expenses" sequence="20"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="menu_hr_expense_root"/>
         <menuitem action="action_request_approve_expense" id="menu_expense_to_approve" name="Approvals" 
             parent="menu_hr_expense_root" groups="base.group_hr_user"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 63330d2a459..5e9b21009c6 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -506,8 +506,8 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_hr_manager"/>
-        <menuitem id="menu_hr_holidays_configuration" name="Leaves" parent="base.menu_config"
-            sequence="21"/>
+        <menuitem id="menu_hr_holidays_configuration" name="Configuration" parent="menu_hr_holidays_root"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem name="Leave Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="menu_hr_holidays_configuration" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Holiday on resource leave -->
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 49d163327e3..bca6ef02b20 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,9 +3,9 @@
     <data>
         <!-- Root Menus -->
 
-        <menuitem id="menu_hr_payroll_configuration" name="Payroll" parent="base.menu_config"
-            sequence="23" groups="base.group_hr_manager"/>
         <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="23"/>
+        <menuitem id="menu_hr_payroll_configuration" name="Configuration" parent="menu_hr_payroll_root"
+            sequence="100" groups="base.group_hr_manager,base.group_configuration"/>
 
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a10d10024aa..08b1af8bd64 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         
-    <menuitem id="menu_hr_recruitment_configuration" name="Recruitment" parent="base.menu_config"
-            sequence="19"/>
+    <menuitem id="menu_hr_recruitment_configuration" name="Configuration" parent="hr.menu_hr_root"
+            sequence="100" groups="base.group_configuration"/>
 
     <!-- Stage -->
     <record id="hr_job_stage_act" model="ir.actions.act_window">
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ec83e80b2ca..78636517250 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -135,8 +135,8 @@
             <field name="context">{'default_invoice_on_timesheets':1}</field>
         </record>
 
-        <menuitem name="Timesheets" id="menu_hr_timesheet_config" sequence="10"
-            parent="base.menu_config"/>
+        <menuitem name="Configuration" id="menu_hr_timesheet_config" sequence="100"
+            parent="hr_attendance.timesheet_menu_root" groups="base.group_configuration"/>
         <menuitem parent="menu_hr_timesheet_config" id="menu_timesheet_accounts" action="act_hr_timesheet_accounts_form" sequence="2" groups="base.group_hr_manager"/>
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 8b06b71cb4b..682e292fece 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -10,7 +10,7 @@
             sequence="116"/>
 
         <menuitem name="Configuration" id="knowledge.menu_document_configuration"
-            parent="knowledge.menu_document" sequence="50"/>
+            parent="knowledge.menu_document" sequence="50" groups="base.group_configuration"/>
 
         <menuitem name="Collaborative Content" id="knowledge.menu_document2"
            parent="knowledge.menu_document"/>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ca1651fc9c6..450e784afa0 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -31,8 +31,8 @@
             <field name="view_mode">form</field>
             <field name="target">inline</field>
         </record>
-        <menuitem id="menu_knowledge_configuration" name="Knowledge" parent="base.menu_config"
-            sequence="19" action="action_knowledge_configuration"/>
+        <menuitem id="menu_knowledge_configuration" name="Configuration" parent="menu_document"
+            sequence="100" action="action_knowledge_configuration" groups="base.group_configuration"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index c3a61c00995..4d5c04b9fe4 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -4,7 +4,7 @@
         <menuitem id='menu_lunch' name='Lunch' sequence="24" 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"/>
+        <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager,base.group_configuration"/>
 
          <!--View Search to group/filter by Supplier and time-->
         <record id="lunch_order_line_view_search" model="ir.ui.view">
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a09c41a75d8..3499657d148 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -8,7 +8,7 @@
 
         <!-- Marketing main configuration menu -->
         <menuitem name="Configuration" id="base.menu_marketing_config_root" sequence="30"
-            parent="base.marketing_menu"/>
+            parent="base.marketing_menu" groups="base.group_configuration"/>
 
     </data>
 </openerp>
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index dbda4773f07..eef46071299 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -15,7 +15,7 @@
             parent="mass_mailing_menu_root" sequence="1" groups="marketing.group_marketing_user"/>
         <!-- Marketing / Configuration -->
         <menuitem name="Configuration" id="mass_mailing_configuration"
-            parent="mass_mailing_menu_root" sequence="99"/>
+            parent="mass_mailing_menu_root" sequence="100" groups="base.group_configuration"/>
 
         <!--  MAIL MAIL STATISTICS !-->
         <record model="ir.ui.view" id="view_mail_mail_statistics_search">
@@ -646,8 +646,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="menu_mass_mailing_configuration" name="Mass Mailing" parent="base.menu_config"
-            sequence="14" groups="marketing.group_marketing_user"/>
+        <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
+            sequence="100" groups="marketing.group_marketing_user,base.group_configuration"/>
 
         <menuitem name="Campaign Stages" id="menu_view_mass_mailing_stages"
             parent="menu_mass_mailing_configuration" sequence="1"
diff --git a/addons/mass_mailing/views/res_config.xml b/addons/mass_mailing/views/res_config.xml
index d2f1d1ea88e..00b9e6445af 100644
--- a/addons/mass_mailing/views/res_config.xml
+++ b/addons/mass_mailing/views/res_config.xml
@@ -31,8 +31,8 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_mass_mailing_configuration" name="Mass Mailing" parent="base.menu_config"
-            sequence="14"/>
+        <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem id="menu_mass_mailing_global_settings" name="Settings" 
             parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration"/>
 
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index c06e65f0c3d..6c6f81505b5 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -122,7 +122,7 @@
 
         <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
-            parent="base.menu_association" sequence="100"/>
+            parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
 
 
         <menuitem name="Membership Products"
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f2f10b2b943..2427f3fc3e8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -62,7 +62,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="group_mrp_manager"
+            groups="group_mrp_manager,base.group_configuration"
             sequence="50"/>
         <menuitem
             id="menu_mrp_configuration_manufacturing"
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8be7b88fce5..643b8184290 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -80,8 +80,8 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="base.menu_mrp_config" name="Manufacturing" parent="base.menu_config"
-            sequence="13" action="action_mrp_configuration"/>
+        <menuitem id="base.menu_mrp_config" name="Configuration" parent="base.menu_mrp_root"
+            sequence="13" action="action_mrp_configuration" groups="base.group_configuration"/>
 
     </data>
 </openerp>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index c0f85e7472e..06f313730be 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -183,7 +183,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" sequence="3" action="note.action_note_note"/>
-    <menuitem name="Notes" id="menu_note_configuration" sequence="3" parent="base.menu_config" groups="base.group_no_one"/>
+    <menuitem name="Configuration" id="menu_note_configuration" sequence="100" parent="menu_note_notes" groups="base.group_configuration"/>
     <menuitem name="Stages" id="menu_notes_stage" parent="menu_note_configuration" action="note.action_note_stage" sequence="21" />
 
   </data>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5c9ddb3f667..49659ede64e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -522,8 +522,8 @@
               </p>
             </field>
         </record>
-        <menuitem name="Point of Sales" parent="base.menu_config"
-            id="menu_point_config_product" sequence="3" groups="group_pos_manager"/>
+        <menuitem name="Configuration" parent="menu_point_root"
+            id="menu_point_config_product" sequence="100" groups="group_pos_manager,base.group_configuration"/>
         <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_config_product" sequence="20" />
         <!-- END -->
 
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 74112186402..b57528a7a04 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_sale_config_sales" name="Sales"
-            parent="base.menu_sale_config" sequence="1"/>
+        <menuitem id="base.menu_sale_config_sales" name="Configuration"
+            parent="base.menu_base_partner" sequence="100" groups="base.group_configuration"/>
         <menuitem id="menu_product_pricelist_main" name="Pricelists" 
             parent="base.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/>
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 893350130db..548b673727e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -14,13 +14,13 @@
             parent="base.menu_main_pm"
             sequence="2" groups="base.group_no_one"/>
 
-        <menuitem id="menu_project_config" name="Project" parent="base.menu_config"
-            sequence="2"/>
+        <menuitem id="menu_project_config" name="Configuration" parent="base.menu_main_pm"
+            sequence="100" groups="base.group_configuration"/>
 
         <menuitem name="Configuration"
             id="base.menu_definitions"
             parent="menu_project_config"
-            groups="base.group_no_one"
+            groups="base.group_configuration"
             sequence="100"/>
 
         <record id="view_task_search_form" model="ir.ui.view">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fc12457f2ca..c1300080a26 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -30,7 +30,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config" sequence="4" groups="group_purchase_manager"/>
+        <menuitem id="menu_purchase_config" name="Configuration" parent="base.menu_purchase_root" sequence="100" groups="group_purchase_manager,base.group_configuration"/>
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config" sequence="50" groups="product.group_purchase_pricelist"/>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index ff1ebdb4bd8..4e629dbe66f 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -108,8 +108,8 @@
             </field>
         </record>
 
-        <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1"/>
+        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
+            sequence="100" groups="base.group_configuration"/>
         <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
             sequence="0" action="base_setup.action_sale_config"/>
 
diff --git a/addons/sales_team/res_config_view.xml b/addons/sales_team/res_config_view.xml
index 983b38e64d1..859fdf87e63 100644
--- a/addons/sales_team/res_config_view.xml
+++ b/addons/sales_team/res_config_view.xml
@@ -22,7 +22,7 @@
                 </data>
             </field>
         </record>
-        <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1" action="base_setup.action_sale_config"/>
+        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
+            sequence="100" action="base_setup.action_sale_config" groups="base.group_configuration"/>
     </data>
 </openerp>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 192db1e5c3f..d320379bcc5 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -120,8 +120,8 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config"
-            sequence="5" groups="group_stock_manager"/>
+        <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
+            sequence="100" groups="group_stock_manager,base.group_configuration"/>
         <menuitem id="menu_stock_general_settings" name="Settings" parent="menu_stock_config_settings"
             sequence="0" action="action_stock_config_settings"/>
     </data>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3224d31ce95..1b38292c13f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -10,8 +10,8 @@
             sequence="12"/>
 
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_config_settings" name="Warehouse" parent="base.menu_config"
-            sequence="5" groups="group_stock_manager"/>
+        <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
+            sequence="100" groups="group_stock_manager,base.group_configuration"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" sequence="1" groups="base.group_no_one"/>
         <menuitem id="menu_reordering_rules_config" name="Schedulers Management" parent="menu_stock_config_settings" sequence="3" groups="base.group_no_one"/>
         <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_config_settings" sequence="2" groups="base.group_no_one"/>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 58bd1997f39..7f3ae4421bd 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -595,7 +595,7 @@
 
 
         <!-- Left menu elements: Technical Configuration -->
-        <menuitem name="Surveys" id="menu_surveys_configuration" parent="base.menu_config" groups="base.group_no_one" sequence="17" />
+        <menuitem name="Configuration" id="menu_surveys_configuration" parent="menu_surveys" groups="base.group_configuration" sequence="100" />
         <menuitem name="Pages" id="menu_survey_page_form1" action="action_survey_page_form" parent="menu_surveys_configuration" sequence="1"/>
         <menuitem name="Questions" id="menu_survey_question_form1" action="action_survey_question_form" parent="menu_surveys_configuration" sequence="2"/>
         <menuitem name="Labels" id="menu_survey_label_form1" action="action_survey_label_form" parent="menu_surveys_configuration" sequence="3"/>
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index 91abcdb19de..71415412fe3 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="90" parent="base.menu_config" name="Website"/>
+        <menuitem id="menu_website_configuration" sequence="36" name="Website Admin"/>
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
             sequence="0" action="action_website_configuration" name="Settings"/>
 
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 28bf7f6a5da..b26f4178b05 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -3,7 +3,7 @@
       <!-- Top menu item -->
           <menuitem id="menu_board_root" name="Dashboards" sequence="35"/>
           <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_system"/>
+          <menuitem id="menu_reporting_config" name="Configuration" parent="menu_board_root" sequence="100" groups="base.group_configuration"/>
 
       <!-- Top menu item -->
       <menuitem name="Settings"
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 40bf8ae8c13..095e027b2e4 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -9,8 +9,8 @@
             sequence="6"/>
 
             <!-- This menu will disappear, I commented it for tests purpose -->
-            <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
-            sequence="1"/>
+            <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
+            sequence="100" groups="base.group_configuration"/>
             <menuitem id="menu_config_address_book" parent="base.menu_sale_config" name="Contacts" sequence="4" groups="group_system"/>
 
         <!-- Partner Titles -->
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 03b3f0a800d..93584a55da0 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -7,8 +7,12 @@
             Note that the field 'category_id' is set later in
             base/module/module_data.xml
         -->
+        <record model="res.groups" id="group_configuration">
+            <field name="name">Configuration</field>
+        </record>
         <record model="res.groups" id="group_erp_manager">
             <field name="name">Access Rights</field>
+            <field name="implied_ids" eval="[(4, ref('group_configuration'))]"/>
         </record>
         <record model="res.groups" id="group_system">
             <field name="name">Settings</field>