[REM] Remove the group 'base.group_configuration'

This additional administration group was formerly used to hide
the configuration menuitems for the common users.

Being manager should be enough to access these items

35 files changed, 31 insertions, 46 deletions

diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 732a9e956d3..9be36c95541 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -14,7 +14,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,base.group_configuration"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
         <!-- 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 fac5d0169d4..967b4b9fe46 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -246,6 +246,6 @@
         </record>
 
         <menuitem id="menu_account_config" name="Settings" parent="menu_finance_configuration"
-            sequence="0" action="action_account_config" groups="base.group_configuration"/>
+            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 b3f907c462e..3d4ed3d6336 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -8,7 +8,7 @@
             web_icon="account,static/description/icon.png"
             id="account.menu_finance"
             sequence="40"/>
-        <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0" groups="base.group_configuration"/>
+        <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0"/>
 
     </data>
 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 18fc8072b2e..910670d3d72 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -8,7 +8,7 @@
             groups="base.group_sale_salesman"
             icon="fa-users"
             sequence="15"/>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100" groups="base.group_configuration"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 51764492c7a..fc5ac1e18ea 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -38,7 +38,7 @@
         </record>
 
         <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
         <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
             sequence="0" action="base_setup.action_sale_config"/>
     </data>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 91be22c65d5..5be0e2317d6 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -39,7 +39,7 @@
         </record>
 
         <menuitem id="menu_event_configuration" name="Configuration" parent="event_main_menu"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
         <menuitem name="Events Types" id="menu_event_type" action="action_event_type" parent="menu_event_configuration"/>
 
         <!-- EVENT.REGISTRATION ACTIONS -->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5f0c583c316..ffe98d23d95 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -11,7 +11,7 @@
             sequence="75"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_reporting_timesheet" name="Reports" parent="menu_hr_root" sequence="99" groups="base.group_hr_manager,base.group_hr_user"/>
-        <menuitem id="menu_human_resources_configuration" name="Configuration" parent="menu_hr_root" sequence="100" groups="base.group_configuration,base.group_hr_manager"/>
+        <menuitem id="menu_human_resources_configuration" name="Configuration" parent="menu_hr_root" sequence="100" groups="base.group_hr_manager"/>
 
         <!-- Employee -->
         <record id="view_employee_form" model="ir.ui.view">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2b6b976b7e2..c99b18e4b1b 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -160,7 +160,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem name="Configuration" parent="menu_hr_attendance_root" id="menu_hr_attendance_config" sequence="100" groups="base.group_configuration,base.group_hr_attendance" action="open_view_attendance_reason"/>
+        <menuitem name="Configuration" parent="menu_hr_attendance_root" id="menu_hr_attendance_config" sequence="100" groups="base.group_hr_attendance" action="open_view_attendance_reason"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_equipment/views/hr_equipment_views.xml b/addons/hr_equipment/views/hr_equipment_views.xml
index 69575c3331a..29b4b6b44fc 100644
--- a/addons/hr_equipment/views/hr_equipment_views.xml
+++ b/addons/hr_equipment/views/hr_equipment_views.xml
@@ -536,7 +536,7 @@
         id="menu_equipment_configuration"
         name="Configuration"
         parent="menu_equipment_title"
-        groups="base.group_hr_manager,base.group_configuration"
+        groups="base.group_hr_manager"
         sequence="100"/>
 
     <menuitem
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index e242871dce0..c5a380c64fe 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -352,7 +352,7 @@
             action="action_approved_expense" sequence="15"/>
         <menuitem id="menu_hr_expense_root" name="Expenses" sequence="100" web_icon="hr_expense,static/description/icon.png"/>
         <menuitem id="menu_hr_expense_configuration" name="Configuration" parent="menu_hr_expense_root"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
         <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_expense_all" action="expense_all" name="My Expenses" parent="menu_hr_expense_root"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c53f46051ec..c5352f5e602 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -549,7 +549,7 @@
         </record>
 
         <menuitem id="menu_hr_holidays_configuration" name="Configuration" parent="menu_hr_holidays_root"
-            sequence="100" groups="base.group_configuration,base.group_hr_manager" action="open_view_holiday_status"/>
+            sequence="100" groups="base.group_hr_manager" action="open_view_holiday_status"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 52ab87f4ce8..8e8da9b0dc1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -5,7 +5,7 @@
 
         <menuitem id="menu_hr_payroll_root" name="Payroll" sequence="45" web_icon="hr_payroll,static/description/icon.png"/>
         <menuitem id="menu_hr_payroll_configuration" name="Configuration" parent="menu_hr_payroll_root"
-            sequence="100" groups="base.group_hr_manager,base.group_configuration"/>
+            sequence="100" groups="base.group_hr_manager"/>
 
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index 831122fc4fd..50d20107b3f 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -538,7 +538,7 @@
         sequence="80"/>
 
     <menuitem id="menu_hr_recruitment_configuration" name="Configuration" parent="menu_hr_recruitment_root"
-        sequence="100" groups="base.group_configuration"/>
+        sequence="100"/>
 
     <!-- ALL JOBS REQUESTS -->
     <menuitem parent="menu_hr_recruitment_root" id="hr.menu_hr_job_position" action="action_hr_job" sequence="1"/>
diff --git a/addons/link_tracker/security/ir.model.access.csv b/addons/link_tracker/security/ir.model.access.csv
index c20e77f650f..ac6c710496c 100644
--- a/addons/link_tracker/security/ir.model.access.csv
+++ b/addons/link_tracker/security/ir.model.access.csv
@@ -1,10 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_link_tracker_user,link.tracker,model_link_tracker,base.group_user,1,0,0,0
-access_link_tracker_manager,link.tracker,model_link_tracker,base.group_configuration,1,1,1,1
 access_link_tracker_public,link.tracker,model_link_tracker,base.group_public,1,0,0,0
 access_link_tracker_code_user,link.tracker.code,model_link_tracker_code,base.group_user,1,0,0,0
-access_link_tracker_code_manager,link.tracker.code,model_link_tracker_code,base.group_configuration,1,1,1,1
 access_link_tracker_code_public,link.tracker.code,model_link_tracker_code,base.group_public,1,0,0,0
 access_link_tracker_click_user,link.tracker.click,model_link_tracker_click,base.group_user,1,0,0,0
-access_link_tracker_click_manager,link.tracker.click,model_link_tracker_click,base.group_configuration,1,1,1,1
 access_link_tracker_click_public,link.tracker.click,model_link_tracker_click,base.group_public,1,0,0,0
diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 79d5be3ff37..52c915cc585 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="105" groups="group_lunch_user" icon="fa-cutlery" web_icon="lunch,static/description/icon.png"/>
         <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"/>
+        <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager"/>
 
          <!--View Search to group/filter by Supplier and time-->
         <record id="lunch_order_line_view_search" model="ir.ui.view">
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 556edf20389..33f378e4d27 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="mass_mailing.group_mass_mailing_user"/>
         <!-- Marketing / Configuration -->
         <menuitem name="Configuration" id="mass_mailing_configuration"
-            parent="mass_mailing_menu_root" sequence="100" groups="base.group_configuration"/>
+            parent="mass_mailing_menu_root" sequence="100"/>
 
         <!--  MAIL MAIL STATISTICS !-->
         <record model="ir.ui.view" id="view_mail_mail_statistics_search">
@@ -683,7 +683,7 @@
         </record>
 
         <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
-            sequence="100" groups="mass_mailing.group_mass_mailing_user,base.group_configuration"/>
+            sequence="100" groups="mass_mailing.group_mass_mailing_user"/>
 
         <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 175cdc1b86c..7bc859bcc27 100644
--- a/addons/mass_mailing/views/res_config.xml
+++ b/addons/mass_mailing/views/res_config.xml
@@ -27,7 +27,7 @@
         </record>
 
         <menuitem id="menu_mass_mailing_configuration" name="Configuration" parent="mass_mailing_menu_root"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
         <menuitem id="menu_mass_mailing_global_settings" name="Settings" 
             parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration"/>
     </data>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 8978a7568c7..92c6cee417b 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -104,7 +104,7 @@
 
         <menuitem name="Members" id="base.menu_association" icon="terp-calendar" sequence="15" web_icon="membership,static/description/icon.png"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
-            parent="base.menu_association" sequence="100" groups="base.group_configuration" action="action_membership_products"/>
+            parent="base.menu_association" sequence="100" action="action_membership_products"/>
 
 
         <!-- MEMBERSHIP/CURRENT MEMBERS -->
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f8b7a476e14..7e6c5ffdbb0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -28,7 +28,7 @@
         <menuitem id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="group_mrp_manager,base.group_configuration"
+            groups="group_mrp_manager"
             sequence="100"/>
 
         <menuitem id="menu_pm_resources_config"
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index e4dd5b577d1..d55d483883e 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -31,6 +31,6 @@
         </record>
 
         <menuitem id="base.menu_mrp_config" name="Settings" parent="menu_mrp_configuration"
-            sequence="0" action="action_mrp_configuration" groups="base.group_configuration"/>
+            sequence="0" action="action_mrp_configuration"/>
     </data>
 </openerp>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 643890dddb0..c088f7de219 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="base.menu_sale_config_sales" name="Configuration"
-            parent="base.menu_base_partner" sequence="100" groups="base.group_configuration"/>
+            parent="base.menu_base_partner" sequence="100"/>
         <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 894fca790c8..c0d331ec49b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -16,7 +16,7 @@
             sequence="2" groups="base.group_no_one,group_project_user"/>
 
         <menuitem id="menu_project_config" name="Configuration" parent="base.menu_main_pm"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
 
         <record id="view_task_search_form" model="ir.ui.view">
             <field name="name">project.task.search.form</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fc355862e1a..a78c0298db7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -18,7 +18,7 @@
             parent="menu_procurement_management"
             action="base.action_partner_supplier_form" sequence="15"/>
 
-        <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" name="Configuration" parent="base.menu_purchase_root" sequence="100" groups="group_purchase_manager"/>
 
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 0785bef09b3..f0422b8aa12 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -49,7 +49,7 @@
         </record>
 
         <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100"/>
         <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/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index bcb75f2cc1c..1d5c36d9da6 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -168,7 +168,6 @@
 
         <menuitem name="Sales Teams"
             id="base.sales_team_config"
-            groups="base.group_configuration"
             parent="base.menu_sale_config"
             action="sales_team_config_action"/>
 
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 61b87826233..39b4a6afbb8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -92,7 +92,7 @@
         </record>
 
         <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
-            sequence="100" groups="group_stock_manager,base.group_configuration"/>
+            sequence="100" groups="group_stock_manager"/>
         <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 7e55e01d93d..0fc6cd5dbc8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -12,7 +12,7 @@
 
         <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="2" groups="base.group_no_one"/>
         <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
-            sequence="100" groups="group_stock_manager,base.group_configuration"/>
+            sequence="100" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
         <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_config_settings" sequence="2" groups="stock.group_adv_location"/>
         <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3" groups="product.group_stock_packaging"/>
diff --git a/addons/utm/security/ir.model.access.csv b/addons/utm/security/ir.model.access.csv
index ecc10883ad6..a568442c64b 100644
--- a/addons/utm/security/ir.model.access.csv
+++ b/addons/utm/security/ir.model.access.csv
@@ -1,7 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_utm_campaign,access_utm_campaign,model_utm_campaign,,1,0,1,0
-access_utm_campaign_manager,access_utm_campaign,model_utm_campaign,base.group_configuration,1,1,1,1
 access_utm_medium,access_utm_medium,model_utm_medium,,1,0,1,0
-access_utm_medium_manager,access_utm_medium,model_utm_medium,base.group_configuration,1,1,1,1
 access_utm_source,access_utm_source,model_utm_source,,1,0,1,0
-access_utm_source_manager,access_utm_source,model_utm_source,base.group_configuration,1,1,1,1
\ No newline at end of file
diff --git a/addons/utm/views/utm.xml b/addons/utm/views/utm.xml
index e1792eedfcf..cdc51b2bc4e 100644
--- a/addons/utm/views/utm.xml
+++ b/addons/utm/views/utm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <menuitem id="menu_link_tracker_root" name="Link Tracker" groups="base.group_no_one" sequence="30"/>
-        <menuitem name="UTMs" id="marketing_utm" groups="base.group_configuration" parent="menu_link_tracker_root" sequence="99"/>
+        <menuitem name="UTMs" id="marketing_utm" parent="menu_link_tracker_root" sequence="99"/>
 
     	<!-- utm.campaign -->
     	<record model="ir.ui.view" id="utm_campaign_tree">
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index 20a883735e0..9303bf09b17 100644
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -136,7 +136,7 @@
         </record>
 
         <menuitem id="menu_website_configuration" sequence="215" name="Website Admin"
-            groups="base.group_configuration" web_icon="website,static/description/icon_admin.png"/>
+            groups="base.group_system" web_icon="website,static/description/icon_admin.png"/>
         <menuitem id="menu_website_global_configuration" parent="menu_website_configuration"
             sequence="100" action="action_website_configuration" name="Configuration"/>
 
diff --git a/addons/website_slides/view/website_slides.xml b/addons/website_slides/view/website_slides.xml
index 6b21bba84c6..f4008a5a545 100644
--- a/addons/website_slides/view/website_slides.xml
+++ b/addons/website_slides/view/website_slides.xml
@@ -201,7 +201,7 @@
                     <t t-set="header_object" t-value="category"/>
                 </t>
             </t>
-            <section t-if="not channel.promoted_slide_id and not tag and not slide_type and not search and not is_public_user and not category and display_channel_settings" class="wrap mt16 mb0" groups="base.group_configuration">
+            <section t-if="not channel.promoted_slide_id and not tag and not slide_type and not search and not is_public_user and not category and display_channel_settings" class="wrap mt16 mb0">
                 <div class="container">
                     <div class="alert alert-danger alert-dismissable mb0">
                         <button type="button" class="close o_slides_hide_channel_settings" t-att-data-channel-id="channel.id" data-dismiss="alert">x</button>
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 7d15c15403b..e8e33230148 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="305" web_icon="base,static/description/board.png" groups="base.group_user"/>
           <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"/>
+          <menuitem id="menu_reporting_config" name="Configuration" parent="menu_board_root" sequence="100" groups="base.group_system"/>
 
       <!-- Top menu item -->
       <menuitem name="Settings"
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 59d7d40137d..ca4fdb1b459 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -128,9 +128,6 @@
         </record>
 
         <!-- add applications to base groups -->
-        <record model="res.groups" id="group_configuration">
-            <field name="category_id" ref="module_category_administration"/>
-        </record>
         <record model="res.groups" id="group_erp_manager">
             <field name="category_id" ref="module_category_administration"/>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 72db4300af5..fd3ee9786b7 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -8,9 +8,8 @@
             groups="base.group_sale_salesman"
             sequence="6"/>
 
-            <!-- This menu will disappear, I commented it for tests purpose -->
             <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
-            sequence="100" groups="base.group_configuration"/>
+            sequence="100" groups="base.group_sale_manager"/>
             <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 e3a4dfa938b..416f965ae94 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -7,12 +7,8 @@
             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">