Revert "[IMP] base,sales_team: Move res_groups and menuitems to sales_team"

This branch need more testing instead of doing 10 fixes. A lot of issues are occuring
when installing modules in different orders.

This reverts commit fa6e415cdb23ce9494487ed672792186157b40e0.

83 files changed, 378 insertions, 352 deletions

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 19bcc372123..a49886ab0c3 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -37,7 +37,7 @@ access_account_invoice_user,account.invoice user,model_account_invoice,base.grou
 access_account_invoice_user,account.invoice.line user,model_account_invoice_line,base.group_user,1,0,0,0
 access_account_payment_term_partner_manager,account.payment.term partner manager,model_account_payment_term,base.group_user,1,0,0,0
 access_account_payment_term_line_partner_manager,account.payment.term.line partner manager,model_account_payment_term_line,base.group_user,1,0,0,0
-access_account_account_sale_manager,account.account sale manager,model_account_account,sales_team.group_sale_manager,1,0,0,0
+access_account_account_sale_manager,account.account sale manager,model_account_account,base.group_sale_manager,1,0,0,0
 access_account_fiscal_position_product_manager,account.fiscal.position account.manager,model_account_fiscal_position,account.group_account_manager,1,1,1,1
 access_account_fiscal_position_tax_product_manager,account.fiscal.position.tax account.manager,model_account_fiscal_position_tax,account.group_account_manager,1,1,1,1
 access_account_fiscal_position_account_product_manager,account.fiscal.position account.manager,model_account_fiscal_position_account,account.group_account_manager,1,1,1,1
@@ -60,9 +60,9 @@ access_account_invoice_line_accountant,account.invoice.line accountant,model_acc
 access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,0,0,0
 access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1
 access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,0,0,0
-access_account_tax_sale_manager,account.tax sale manager,model_account_tax,sales_team.group_sale_salesman,1,0,0,0
-access_account_journal_sale_manager,account.journal sale manager,model_account_journal,sales_team.group_sale_salesman,1,0,0,0
-access_account_invoice_tax_sale_manager,account.invoice.tax  sale manager,model_account_invoice_tax,sales_team.group_sale_salesman,1,0,0,0
+access_account_tax_sale_manager,account.tax sale manager,model_account_tax,base.group_sale_salesman,1,0,0,0
+access_account_journal_sale_manager,account.journal sale manager,model_account_journal,base.group_sale_salesman,1,0,0,0
+access_account_invoice_tax_sale_manager,account.invoice.tax  sale manager,model_account_invoice_tax,base.group_sale_salesman,1,0,0,0
 access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1
 access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0
 access_account_account_tax,account.account.tag,model_account_account_tag,account.group_account_user,1,0,0,0
@@ -79,4 +79,4 @@ access_account_cashbox_line,account.bank.statement.cashbox.line,model_account_ca
 access_account_tax_group_internal_user,account.tax.group internal user,model_account_tax_group,base.group_user,1,0,0,0
 access_account_tax_group,account.tax.group,model_account_tax_group,account.group_account_invoice,1,0,0,0
 access_account_tax_group_manager,account.tax.group,model_account_tax_group,account.group_account_manager,1,1,1,1
-access_account_tax_group_sale_manager,account.tax.group sale manager,model_account_tax_group,sales_team.group_sale_salesman,1,0,0,0
+access_account_tax_group_sale_manager,account.tax.group sale manager,model_account_tax_group,base.group_sale_salesman,1,0,0,0
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
index 0960cb1633d..dc2ecfdb076 100644
--- a/addons/account_analytic_default/security/ir.model.access.csv
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0

 access_account_analytic_default_analytic,account.analytic.default analytic,model_account_analytic_default,analytic.group_analytic_accounting,1,0,0,0

 access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1

-access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,sales_team.group_sale_salesman,1,1,1,1

+access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index afaa290adbc..910670d3d72 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -5,7 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Members"
             id="base.menu_association"
-            groups="sales_team.group_sale_salesman"
+            groups="base.group_sale_salesman"
             icon="fa-users"
             sequence="15"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100"/>
diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/res_config.py
index 246900e0e75..9602593c105 100644
--- a/addons/base_setup/models/res_config.py
+++ b/addons/base_setup/models/res_config.py
@@ -55,3 +55,10 @@ class BaseConfigSettings(models.TransientModel):
         partner_rule = self.env.ref('base.res_partner_rule')
         for config in self:
             partner_rule.write({'active': not config.company_share_partner})
+
+
+# Empty class but required since it's overrided by sale & crm
+class SaleConfigSettings(models.TransientModel):
+
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml
index bdba02a9399..b45a4909c97 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/res_config_views.xml
@@ -124,4 +124,29 @@
             action="action_general_configuration"
             groups="base.group_system"/>
 
+
+        <!-- Sale config wizard -->
+        <record id="view_sale_config_settings" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="arch" type="xml">
+                <form string="Configure Sales" class="oe_form_configuration">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+                    </header>
+                    <div id="main"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_config" model="ir.actions.act_window">
+            <field name="name">Configure Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.settings</field>
+            <field name="view_id" ref="view_sale_config_settings"/>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
 </odoo>
diff --git a/addons/base_setup/views/res_partner_views.xml b/addons/base_setup/views/res_partner_views.xml
index 01ca51cb892..9eef80f6539 100644
--- a/addons/base_setup/views/res_partner_views.xml
+++ b/addons/base_setup/views/res_partner_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- YTI To remove -->
         <!-- Add partner categories in partner kanban view -->
         <record id="res_partner_kanban_view" model="ir.ui.view">
             <field name="name">res.partner.kanban.inherit</field>
diff --git a/addons/calendar/security/ir.model.access.csv b/addons/calendar/security/ir.model.access.csv
index 144da577ab6..c6f55f93af8 100644
--- a/addons/calendar/security/ir.model.access.csv
+++ b/addons/calendar/security/ir.model.access.csv
@@ -2,15 +2,15 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_calendar_attendee_portal,calendar.attendee_portal,model_calendar_attendee,base.group_portal,1,1,0,0

 access_calendar_attendee_employee,calendar.attendee_employee,model_calendar_attendee,base.group_user,1,1,1,1

 access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1

-access_calendar_event_manager,calendar.event.manager,model_calendar_event,sales_team.group_sale_manager,1,1,1,1

-access_calendar_event,calendar.event,model_calendar_event,sales_team.group_sale_salesman,1,1,1,0

+access_calendar_event_manager,calendar.event.manager,model_calendar_event,base.group_sale_manager,1,1,1,1

+access_calendar_event,calendar.event,model_calendar_event,base.group_sale_salesman,1,1,1,0

 access_calendar_event_all_user,calendar.event_all_user,model_calendar_event,base.group_portal,1,0,0,0

 access_calendar_event_all_employee,calendar.event_all_employee,model_calendar_event,base.group_user,1,1,1,1

 access_calendar_event_partner_manager,calendar.event.partner.manager,model_calendar_event,base.group_partner_manager,1,1,1,1

 access_calendar_event_type_all,calendar.event.type.all,model_calendar_event_type,base.group_user,1,0,0,0

-access_calendar_event_type_sale_manager,calendar.event.type.manager,model_calendar_event_type,sales_team.group_sale_manager,1,1,1,0

+access_calendar_event_type_sale_manager,calendar.event.type.manager,model_calendar_event_type,base.group_sale_manager,1,1,1,0

 access_calendar_event_type_sale_user,calendar.event.type.user,model_calendar_event_type,base.group_user,1,0,0,0

-access_calendar_event_type_sale_user,calendar.event.type.salesman,model_calendar_event_type,sales_team.group_sale_salesman,1,0,0,0

+access_calendar_event_type_sale_user,calendar.event.type.salesman,model_calendar_event_type,base.group_sale_salesman,1,0,0,0

 access_calendar_event_type_manager,calendar.event.type.manager,model_calendar_event_type,base.group_system,1,1,1,1

 access_calendar_alarm_manager,access_calendar_alarm_manager,model_calendar_alarm_manager,base.group_user,1,1,1,1

 access_calendar_contacts_all,access_calendar_contacts_all,model_calendar_contacts,base.group_user,1,1,1,1

diff --git a/addons/crm/calendar_event_menu.xml b/addons/crm/calendar_event_menu.xml
index c9d43050387..eb3889f0857 100644
--- a/addons/crm/calendar_event_menu.xml
+++ b/addons/crm/calendar_event_menu.xml
@@ -3,7 +3,7 @@
 <data>
 
     <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
-        parent="sales_team.menu_base_partner"/>
+        parent="base.menu_base_partner"/>
 
     <record id="view_crm_meeting_search" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 60834cbc311..4daf241fd49 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
         <record id="sales_team.team_sales_department" model="crm.team">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f21a1cd6a94..4f81a01b851 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -889,7 +889,7 @@ Update your business card, phone book, social media,... Send an email right now
     def _notification_group_recipients(self, cr, uid, ids, message, recipients, done_ids, group_data, context=None):
         """ Override the mail.thread method to handle salesman recipients.
         Indeed those will have specific action in their notification emails. """
-        group_sale_salesman = self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'sales_team.group_sale_salesman')
+        group_sale_salesman = self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'base.group_sale_salesman')
         for recipient in recipients:
             if recipient.id in done_ids:
                 continue
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 1d212e9a53c..561ccfe2cab 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -103,10 +103,10 @@
         <field name="act_window_id" ref="crm_lead_opportunities"/>
     </record>
 
-    <menuitem id="sales_team.menu_sales" name="Sales" parent="sales_team.menu_base_partner" sequence="5"/>
-    <menuitem name="Leads" id="menu_crm_leads" parent="sales_team.menu_sales" sequence="1"
+    <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="5"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" sequence="1"
             action="crm_lead_all_leads" groups="crm.group_use_lead"/>
-    <menuitem id="menu_crm_opportunities" action="action_your_pipeline" parent="sales_team.menu_sales" sequence="4"/>
+    <menuitem id="menu_crm_opportunities" action="action_your_pipeline" parent="base.menu_sales" sequence="4"/>
 
     <record id="crm_lead_action_activities" model="ir.actions.act_window">
         <field name="name">Next Activities</field>
@@ -134,7 +134,7 @@
     </record>
 
     <menuitem id="crm_lead_menu_activities" name="Next Activities" sequence="5"
-        parent="sales_team.menu_sales" action="crm_lead_action_activities" />
+        parent="base.menu_sales" action="crm_lead_action_activities" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c667c69b2fd..1252ad41fb6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -114,7 +114,7 @@
                         </group>
                         <group>
                             <field name="user_id" on_change="on_change_user(user_id, context)" domain="[('share', '=', False)]"
-                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}"/>
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads'], 'team_id': team_id}"/>
                             <field name="team_id" widget="selection" domain="[('use_leads','=',True)]"/>
                             <field name="type" invisible="1"/>
                         </group>
@@ -445,7 +445,7 @@
                             </group>
 
                             <group>
-                                <field name="user_id" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}" domain="[('share', '=', False)]"/>
+                                <field name="user_id" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads'], 'team_id': team_id}" domain="[('share', '=', False)]"/>
                                 <field name="team_id" widget="selection"/>
                             </group>
                             <group>
@@ -629,7 +629,7 @@
                             'default_use_template': True,
                             'default_template_id': ref('crm.email_template_opportunity_mail'),
                         }"
-                groups="sales_team.group_sale_salesman"
+                groups="base.group_sale_salesman"
                 />
 
         <!--Update of email_template defined in crm_lead_data, to add ref_ir_act_window
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index be7ffcb5d40..9c71d3d6194 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -8,17 +8,19 @@
             the base module in order to set new groups.
         -->
         <menuitem name="CRM"
-            id="sales_team.menu_base_partner"
-            web_icon="crm,static/description/icon.png"/>
+            id="base.menu_base_partner"
+            groups="base.group_sale_manager,base.group_sale_salesman"
+            web_icon="crm,static/description/icon.png"
+            sequence="6"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="sales_team.menu_sale_config" sequence="5" groups="sales_team.group_sale_manager"/>
+            parent="base.menu_sale_config" sequence="5" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
-            parent="sales_team.menu_sale_config" sequence="1" groups="sales_team.group_sale_manager"/>
+            parent="base.menu_sale_config" sequence="1" groups="base.group_sale_manager"/>
 
-        <menuitem id="sales_team.menu_sale_config_sales" name="Sales"
-            parent="sales_team.menu_sale_config" sequence="0" groups="sales_team.group_sale_manager"/>
+        <menuitem id="base.menu_sale_config_sales" name="Sales"
+            parent="base.menu_sale_config" sequence="0" groups="base.group_sale_manager"/>
 
         <!-- CRM.LOST.REASON VIEWS -->
         <record id="crm_lost_reason_view_search" model="ir.ui.view">
diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_view.xml
index 66d1ad8d5ae..f71cbe5fe14 100644
--- a/addons/crm/report/crm_activity_report_view.xml
+++ b/addons/crm/report/crm_activity_report_view.xml
@@ -58,7 +58,7 @@
            <field name="domain">[]</field>
        </record>
        <menuitem name="Activities" id="crm_activity_report_menu"
-            groups="sales_team.group_sale_manager"
+            groups="base.group_sale_manager"
             parent="base.menu_sale_report" action="crm_activity_report_action" sequence="7"/>
 
        <record id="crm_activity_report_action_team" model="ir.actions.act_window">
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 1e9cc22ae15..47e3f2b20d3 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -4,7 +4,7 @@
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="inherit_id" ref="sales_team.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div id="main" position="inside">
                     <group string="CRM" name="config_alias">
@@ -47,9 +47,9 @@
             </field>
         </record>
 
-        <menuitem id="sales_team.menu_sale_config" name="Configuration" parent="sales_team.menu_base_partner"
+        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
             sequence="100"/>
-        <menuitem id="sales_team.menu_sale_general_settings" name="Settings" parent="sales_team.menu_sale_config"
-            sequence="0" action="sales_team.action_sale_config" groups="base.group_system"/>
+        <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
+            sequence="0" action="base_setup.action_sale_config" groups="base.group_system"/>
     </data>
 </openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 6a7a1ff2ab9..b211f06d5e4 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -2,25 +2,25 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="sales_team.group_sale_salesman" model="res.groups">
+    <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">User: Own Documents Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
-    <record id="sales_team.group_sale_salesman_all_leads" model="res.groups">
+    <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">User: All Documents</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
         <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
-    <record id="sales_team.group_sale_manager" model="res.groups">
+    <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
@@ -33,12 +33,12 @@
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
 
-    <record model='ir.ui.menu' id='sales_team.menu_base_partner'>
-        <field name="groups_id" eval="[(4,ref('sales_team.group_sale_manager')),(4,ref('sales_team.group_sale_salesman'))]"/>
+    <record model='ir.ui.menu' id='base.menu_base_partner'>
+        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
 
-    <record model="ir.ui.menu" id="sales_team.menu_sale_config">
-        <field eval="[(4, ref('sales_team.group_sale_manager'))]" name="groups_id"/>
+    <record model="ir.ui.menu" id="base.menu_sale_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
 </data>
@@ -49,13 +49,13 @@
         <field name="name">Personal Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
     <record id="crm_rule_all_lead" model="ir.rule">
         <field name="name">All Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="calendar_event_global" model="ir.rule">
@@ -69,28 +69,28 @@
         <field name="name">Personal Leads Analysis</field>
         <field ref="model_crm_opportunity_report" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="crm_rule_all_lead_report" model="ir.rule">
         <field name="name">All Leads Analysis</field>
         <field ref="model_crm_opportunity_report" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="crm_activity_report_rule_all_activities" model="ir.rule">
         <field name="name">All Activities</field>
         <field ref="model_crm_activity_report" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="crm_activity_report_rule_personal_activities" model="ir.rule">
         <field name="name">Personal Activities</field>
         <field ref="model_crm_activity_report" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index b1f839b819e..a1ecf821756 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,24 +1,24 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_crm_lead_manager,crm.lead.manager,model_crm_lead,sales_team.group_sale_manager,1,1,1,1

-access_crm_lead,crm.lead,model_crm_lead,sales_team.group_sale_salesman,1,1,1,0

+access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1

+access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0

 access_crm_stage,crm.stage,model_crm_stage,,1,0,0,0

-access_crm_stage_manager,crm.stage,model_crm_stage,sales_team.group_sale_manager,1,1,1,1

-access_crm_opportunity_report_user,crm.opportunity.report,model_crm_opportunity_report,sales_team.group_sale_salesman,1,0,0,0

-access_crm_opportunity_report_manager,crm.opportunity.report,model_crm_opportunity_report,sales_team.group_sale_manager,1,1,1,1

-access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,sales_team.group_sale_manager,1,0,0,0

-access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,sales_team.group_sale_manager,1,0,0,0

-access_res_partner,res.partner.crm.user,base.model_res_partner,sales_team.group_sale_salesman,1,1,1,0

-access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,sales_team.group_sale_salesman,1,1,1,0

-mail_mailgate_thread,mail.thread,mail.model_mail_thread,sales_team.group_sale_salesman,1,1,1,1

-access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,sales_team.group_sale_manager,1,1,1,1

+access_crm_stage_manager,crm.stage,model_crm_stage,base.group_sale_manager,1,1,1,1

+access_crm_opportunity_report_user,crm.opportunity.report,model_crm_opportunity_report,base.group_sale_salesman,1,0,0,0

+access_crm_opportunity_report_manager,crm.opportunity.report,model_crm_opportunity_report,base.group_sale_manager,1,1,1,1

+access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0

+access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0

+access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0

+access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0

+mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1

+access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1

 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0

 access_crm_lead_tag,crm_lead_tag,model_crm_lead_tag,base.group_user,1,0,0,0

-access_crm_lead_tag_salesman,crm_lead_tag salesman,model_crm_lead_tag,sales_team.group_sale_salesman,1,1,1,0

-access_crm_lead_tag_manager,crm_lead_tag manager,model_crm_lead_tag,sales_team.group_sale_manager,1,1,1,1

-access_crm_lost_reason_manager,crm.lost.reason.manager,model_crm_lost_reason,sales_team.group_sale_manager,1,1,1,1

-access_crm_lost_reason_salesman,crm.lost.reason.salesman,model_crm_lost_reason,sales_team.group_sale_salesman,1,0,0,0

+access_crm_lead_tag_salesman,crm_lead_tag salesman,model_crm_lead_tag,base.group_sale_salesman,1,1,1,0

+access_crm_lead_tag_manager,crm_lead_tag manager,model_crm_lead_tag,base.group_sale_manager,1,1,1,1

+access_crm_lost_reason_manager,crm.lost.reason.manager,model_crm_lost_reason,base.group_sale_manager,1,1,1,1

+access_crm_lost_reason_salesman,crm.lost.reason.salesman,model_crm_lost_reason,base.group_sale_salesman,1,0,0,0

 access_crm_lost_reason_user,crm.lost.reason.user,model_crm_lost_reason,base.group_user,1,0,0,0

 access_crm_activity_user,crm.activity.user,model_crm_activity,base.group_user,1,1,1,0

-access_crm_activity_manager,crm.activity.manager,model_crm_activity,sales_team.group_sale_manager,1,1,1,1

-access_crm_activity_salesman,crm.activity.salesman,model_crm_activity,sales_team.group_sale_salesman,1,1,1,0

+access_crm_activity_manager,crm.activity.manager,model_crm_activity,base.group_sale_manager,1,1,1,1

+access_crm_activity_salesman,crm.activity.salesman,model_crm_activity,base.group_sale_salesman,1,1,1,0

 access_crm_activity_report_user,crm.activity.report.user,model_crm_activity_report,base.group_user,1,0,0,0

diff --git a/addons/crm/test/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml
index 176283592b7..e7fdc86d096 100644
--- a/addons/crm/test/crm_access_group_users.yml
+++ b/addons/crm/test/crm_access_group_users.yml
@@ -11,7 +11,7 @@
 -
   !record {model: res.users, id: crm_res_users_salesmanager}:
     groups_id:
-      - sales_team.group_sale_manager
+      - base.group_sale_manager
 -
   Create a user as 'Crm Salesman'
 -
@@ -25,5 +25,5 @@
 -
   !record {model: res.users, id: crm_res_users_salesman}:
     groups_id:
-      - sales_team.group_sale_salesman_all_leads
+      - base.group_sale_salesman_all_leads
       - base.group_partner_manager
diff --git a/addons/crm/tests/common.py b/addons/crm/tests/common.py
index b59be71bada..7156d1a0844 100644
--- a/addons/crm/tests/common.py
+++ b/addons/crm/tests/common.py
@@ -10,7 +10,7 @@ class TestCrm(TestMail):
         super(TestCrm, cls).setUpClass()
 
         user_group_employee = cls.env.ref('base.group_user')
-        user_group_salesman_all = cls.env.ref('sales_team.group_sale_salesman_all_leads')
+        user_group_salesman_all = cls.env.ref('base.group_sale_salesman_all_leads')
 
         # Test users to use through the various tests
         Users = cls.env['res.users'].with_context({'no_reset_password': True, 'mail_create_nosubscribe': True})
diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml
index 12a43dd3409..cbbd1f9ab13 100644
--- a/addons/crm/web_planner_data.xml
+++ b/addons/crm/web_planner_data.xml
@@ -956,7 +956,7 @@
     <record id="planner_crm" model="web.planner">
         <field name="name">Sales strategy planner</field>
         <field name="view_id" ref="crm_planner"/>
-        <field name="menu_id" ref="sales_team.menu_base_partner"/>
+        <field name="menu_id" ref="base.menu_base_partner"/>
         <field name="planner_application">planner_crm</field>
         <field name="tooltip_planner"><![CDATA[
             Plan your sales strategy: objectives, leads, KPIs, and much more!
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 9d5d533db3d..a7caf1fcdf0 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -109,7 +109,7 @@
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
             view_id="view_crm_lead2opportunity_partner_mass"
-            groups="sales_team.group_sale_salesman"
+            groups="base.group_sale_salesman"
         />
 
     </data>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 964372a6b64..7dfc976c6ce 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -50,7 +50,7 @@
             key2="client_action_multi" name="Merge leads/opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
-            groups="sales_team.group_sale_salesman"
+            groups="base.group_sale_salesman"
             />
 
     </data>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 025be1e2eed..0f82c08debe 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[@name='lead']" position="after">
-                    <page string="Assigned Partner" groups="sales_team.group_sale_salesman">
+                    <page string="Assigned Partner" groups="base.group_sale_salesman">
                         <group col="3">
                             <label for="partner_latitude" string="Geolocation"/>
                             <div class="o_row">
@@ -68,7 +68,7 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[@name='extra']" position="after">
-                    <page string="Assigned Partner" groups="sales_team.group_sale_salesman">
+                    <page string="Assigned Partner" groups="base.group_sale_salesman">
                         <group col="3">
                             <label for="partner_latitude" string="Geolocation"/>
                             <div class="o_row">
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 074cb71a036..f45899074b6 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -33,7 +33,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="res_partner_activation_config_mi" parent="sales_team.menu_localisation" action="res_partner_activation_act" groups="base.group_no_one"
+        <menuitem id="res_partner_activation_config_mi" parent="base.menu_localisation" action="res_partner_activation_act" groups="base.group_no_one"
             sequence="6"/>
 
     <!--Partner Level -->
@@ -76,7 +76,7 @@
     </record>
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"
         groups="base.group_no_one"
-        parent="sales_team.menu_localisation"
+        parent="base.menu_localisation"
         sequence="5" />
 
     <!-- Partner form -->
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index 9980d025eb4..3f39d776ddc 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -1,12 +1,12 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_ crm_lead_report_assign,crm.lead.report.assign,model_crm_lead_report_assign,sales_team.group_sale_salesman,1,1,1,0

+access_ crm_lead_report_assign,crm.lead.report.assign,model_crm_lead_report_assign,base.group_sale_salesman,1,1,1,0

 access_ crm_lead_report_assign_all,crm.lead.report.assign.all,model_crm_lead_report_assign,base.group_user,1,0,0,0

-access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,sales_team.group_sale_salesman,1,0,0,0

-access_res_partner_grade,res.partner.grade,model_res_partner_grade,sales_team.group_sale_salesman,1,1,1,0

+access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,base.group_sale_salesman,1,0,0,0

+access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0

 access_res_partner_grade_employee,res.partner.grade,model_res_partner_grade,base.group_user,1,0,0,0

 access_res_partner_grade_portal,res.partner.grade,model_res_partner_grade,base.group_portal,1,0,0,0

 access_res_partner_grade_public,res.partner.grade,model_res_partner_grade,base.group_public,1,0,0,0

-access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,sales_team.group_sale_manager,1,1,1,1

+access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1

 access_res_partner_activation_user,res.partner.activation.user,model_res_partner_activation,base.group_user,1,0,0,0

 "access_partner_activation_manager","res.partner.activation.manager","model_res_partner_activation","base.group_partner_manager",1,1,1,1

 partner_access_crm_lead,crm.lead,model_crm_lead,base.group_portal,1,1,0,0

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 969bdf942f8..7daac520d0e 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -49,7 +49,7 @@
         <act_window id="action_crm_send_mass_forward" multi="True"
             key2="client_action_multi" name="Forward to Partner" res_model="crm.lead.forward.to.partner"
             src_model="crm.lead" view_mode="form" target="new" view_type="form"
-            groups="sales_team.group_sale_manager"
+            groups="base.group_sale_manager"
             context="{'default_composition_mode' : 'mass_mail'}" view_id="crm_lead_forward_to_partner_form" />
 
     </data>
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 9c3f08c7a90..00b2d70a432 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_delivery_carrier,delivery.carrier,model_delivery_carrier,sales_team.group_sale_salesman,1,0,0,0

-access_delivery_price_rule,delivery.price.rule,model_delivery_price_rule,sales_team.group_sale_salesman,1,0,0,0

-access_delivery_carrier_manager,delivery.carrier,model_delivery_carrier,sales_team.group_sale_manager,1,1,1,1

-access_delivery_price_rule_manager,delivery.price.rule,model_delivery_price_rule,sales_team.group_sale_manager,1,1,1,1

+access_delivery_carrier,delivery.carrier,model_delivery_carrier,base.group_sale_salesman,1,0,0,0

+access_delivery_price_rule,delivery.price.rule,model_delivery_price_rule,base.group_sale_salesman,1,0,0,0

+access_delivery_carrier_manager,delivery.carrier,model_delivery_carrier,base.group_sale_manager,1,1,1,1

+access_delivery_price_rule_manager,delivery.price.rule,model_delivery_price_rule,base.group_sale_manager,1,1,1,1

 access_delivery_carrier_partner_manager,delivery.carrier partner_manager,model_delivery_carrier,base.group_partner_manager,1,0,0,0

 access_delivery_carrier_stock_user,delivery.carrier stock_user,model_delivery_carrier,stock.group_stock_user,1,0,0,0

 access_delivery_carrier_stock_manager,delivery.carrier,model_delivery_carrier,stock.group_stock_manager,1,1,1,1

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 78f13e933a7..0e65b922654 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -2,7 +2,7 @@
 <odoo>
         <!-- Delivery Carriers -->
         <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="50"/>
-        <menuitem id="sale_menu_delivery" name="Delivery" parent="sales_team.menu_sale_config" groups="sales_team.group_sale_manager" sequence="12"/>
+        <menuitem id="sale_menu_delivery" name="Delivery" parent="base.menu_sale_config" groups="base.group_sale_manager" sequence="12"/>
 
         <record id="view_delivery_carrier_search" model="ir.ui.view">
             <field name="name">delivery.carrier.search</field>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 69d79bacd1c..684d2a51844 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -120,7 +120,7 @@
             <field name="name">Monthly Sales Targets</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">ranking</field>
-            <field name="user_domain" eval="[('groups_id', 'in', ref('sales_team.group_sale_salesman'))]" />
+            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />
             <field name="report_message_frequency">weekly</field>
         </record>
 
@@ -128,7 +128,7 @@
             <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">ranking</field>
-            <field name="user_domain" eval="[('groups_id', 'in', ref('sales_team.group_sale_salesman'))]" />
+            <field name="user_domain" eval="[('groups_id', 'in', ref('base.group_sale_salesman'))]" />
             <field name="report_message_frequency">weekly</field>
         </record>
 
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index b518eb11fb3..89b966f4a08 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -6,9 +6,9 @@ access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcente
 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
 access_mrp_bom_line,mrp.bom.line,model_mrp_bom_line,group_mrp_user,1,0,0,0
 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
-access_mrp_production_salesman,mrp.production salesman,model_mrp_production,sales_team.group_sale_salesman,1,1,1,0
-access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,sales_team.group_sale_salesman,1,0,1,0
-access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,sales_team.group_sale_salesman,1,0,1,0
+access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
+access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
+access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,base.group_sale_salesman,1,0,1,0
 access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,mrp.group_mrp_user,1,1,1,1
 access_procurement,procurement.order,model_procurement_order,mrp.group_mrp_user,1,1,1,1
 access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1
@@ -52,9 +52,9 @@ access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,stock.model_st
 access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0
 access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0
 access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0
-access_mrp_bom_salesman,mrp.bom,model_mrp_bom,sales_team.group_sale_salesman,1,0,0,0
+access_mrp_bom_salesman,mrp.bom,model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_mrp_bom_stockuser,mrp.bom,model_mrp_bom,stock.group_stock_user,1,0,0,0
-access_mrp_bom_line_salesman,mrp.bom.line,model_mrp_bom_line,sales_team.group_sale_salesman,1,0,0,0
+access_mrp_bom_line_salesman,mrp.bom.line,model_mrp_bom_line,base.group_sale_salesman,1,0,0,0
 access_mrp_bom_line_stockuser,mrp.bom.line,model_mrp_bom_line,stock.group_stock_user,1,0,0,0
 access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,1,1,1
 access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,1,1,1
diff --git a/addons/payment/security/payment_security.xml b/addons/payment/security/payment_security.xml
index c012f093b8f..f2dedd5e6ee 100644
--- a/addons/payment/security/payment_security.xml
+++ b/addons/payment/security/payment_security.xml
@@ -17,7 +17,7 @@
             <field name="name">Access every payment transaction</field>
             <field name="model_id" ref="payment.model_payment_transaction"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
         </record>
 
         <record id="payment_method_user_rule" model="ir.rule">
@@ -30,7 +30,7 @@
         <record id="payment_method_salesman_rule" model="ir.rule">
             <field name="name">Access every payment method</field>
             <field name="model_id" ref="payment.model_payment_method"/>
-            <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
         </record>
 
     </data>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 465f9c3a0ff..585b2253b84 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data>
 
+        <menuitem id="base.menu_sale_config_sales" name="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"/>
+
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.tree</field>
             <field name="model">product.pricelist.item</field>
@@ -169,5 +174,8 @@
             </field>
         </record>
 
+        <menuitem
+            action="product_pricelist_action2" id="menu_product_pricelist_action2"
+            parent="product.menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
     </data>
 </openerp>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index e560713ea23..07b93f2563a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+        </record>
+
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f42b84b1bd0..c2d3a249931 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem id="base.menu_product" name="Product Variants" parent="base.menu_base_partner" sequence="9" groups="product.group_product_variant"/>
 
         <!-- Variants -->
         <record id="product_attribute_value_view_tree" model="ir.ui.view">
@@ -420,8 +421,15 @@
             </field>
         </record>
 
+        <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="13" />
+
         <!-- product product -->
 
+        <menuitem id="prod_config_main" name="Products" parent="base.menu_sale_config" sequence="2"/>
+
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
@@ -535,6 +543,10 @@
             <field name="view_type">form</field>
         </record>
 
+        <menuitem action="attribute_action"
+            id="menu_attribute_action"
+            parent="product.prod_config_main" sequence="4" groups="product.group_product_variant"/>
+
         <record id="variants_tree_view" model="ir.ui.view">
             <field name="name">product.attribute.value.tree</field>
             <field name="model">product.attribute.value</field>
@@ -555,6 +567,10 @@
             <field name="view_type">form</field>
         </record>
 
+        <menuitem action="variants_action"
+            id="menu_variants_action"
+            parent="product.prod_config_main" sequence="5" groups="product.group_product_variant"/>
+
         <!--  -->
 
         <record id="product_normal_action_sell" model="ir.actions.act_window">
@@ -581,6 +597,8 @@
             </field>
         </record>
 
+        <menuitem id="product.menu_products" action="product.product_normal_action_sell" parent="base.menu_sales" groups="product.group_product_variant" sequence="99"/>
+
         <record id="product_category_search_view" model="ir.ui.view">
             <field name="name">product.category.search</field>
             <field name="model">product.category</field>
@@ -639,6 +657,10 @@
             <field name="search_view_id" ref="product_category_search_view"/>
             <field name="view_id" ref="product_category_list_view"/>
         </record>
+        <menuitem action="product_category_action_form"
+            groups="base.group_no_one"
+            id="menu_product_category_action_form"
+            parent="prod_config_main" sequence="2"/>
 
         <!-- Unit of Measure -->
 
@@ -702,6 +724,8 @@
               </p>
             </field>
         </record>
+        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="30" groups="product.group_uom"/>
+        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="product.prod_config_main" sequence="6" groups="product.group_uom"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
@@ -731,6 +755,7 @@
               </p>
             </field>
         </record>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.prod_config_main" sequence="7" groups="base.group_no_one"/>
 
         <record model="ir.actions.act_window" id="action_packaging_view">
             <field name="name">Packagings</field>
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index e9c642737ad..1b5efabf9d2 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -7,10 +7,19 @@ access_product_packaging_user,product.packaging.user,model_product_packaging,bas
 access_product_supplierinfo_user,product.supplierinfo.user,model_product_supplierinfo,base.group_user,1,0,0,0

 access_product_pricelist_user,product.pricelist.user,model_product_pricelist,base.group_user,1,0,0,0

 access_product_pricelist_item_user,product.pricelist.item.user,model_product_pricelist_item,base.group_user,1,0,0,0

+access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1

 access_product_pricelist_partner_manager,product.pricelist partner manager,model_product_pricelist,base.group_partner_manager,1,0,0,0

 access_product_product_employee,product.product employee,model_product_product,base.group_user,1,0,0,0

 access_product_price_history_employee,prices.history employee,model_product_price_history,base.group_user,1,0,0,0

+access_product_price_history_salemanager,prices.history sale manager,product.model_product_price_history,base.group_sale_manager,1,1,1,1

+access_product_template_sale_manager,product.template salemanager,model_product_template,base.group_sale_manager,1,1,1,1

+access_product_product_sale_manager,product.product salemanager,model_product_product,base.group_sale_manager,1,1,1,1

+access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1

 access_product_attribute,product.attribute,model_product_attribute,base.group_user,1,0,0,0

 access_product_attribute_value,product.attribute value,model_product_attribute_value,base.group_user,1,0,0,0

 access_product_attribute_price,product.attribute price,model_product_attribute_price,base.group_user,1,0,0,0

 access_product_attribute_line,product.attribute line,model_product_attribute_line,base.group_user,1,0,0,0

+access_product_attribute_sale_manager,product.attribute manager,model_product_attribute,base.group_sale_manager,1,1,1,1

+access_product_attribute_value_sale_manager,product.attribute manager value,model_product_attribute_value,base.group_sale_manager,1,1,1,1

+access_product_attribute_price_sale_manager,product.attribute manager price,model_product_attribute_price,base.group_sale_manager,1,1,1,1

+access_product_attribute_line_sale_manager,product.attribute manager line,model_product_attribute_line,base.group_sale_manager,1,1,1,1

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 08ebd4ee6e0..0860f6af65c 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -4,7 +4,7 @@
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman')),(4, ref('group_project_manager'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_manager'))]"/>
         </record>
 
         <!-- Categories -->
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index db0eab039f1..84fea7b5ffe 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -12,10 +12,10 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
-access_project_task_sale_user,project.task salesman,model_project_task,sales_team.group_sale_salesman,1,1,1,1
-access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,sales_team.group_sale_salesman,1,0,0,0
-access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,sales_team.group_sale_salesman,1,1,1,1
-access_project_project_sale_user,project.project salesman,model_project_project,sales_team.group_sale_salesman,1,0,0,0
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1
+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,0,0,0
+access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1
+access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 0c2001fca4c..21386d80ce7 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -4,6 +4,6 @@ access_project_issue_report_all,project.issue.report,model_project_issue_report,
 access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1

 access_project_issue_report_user,project.issue.report user,model_project_issue_report,project.group_project_user,1,0,0,0

 access_crm_team,crm.team,sales_team.model_crm_team,project.group_project_user,1,0,0,0

-access_project_issue_salesman,project.issue,model_project_issue,sales_team.group_sale_salesman,1,0,0,0

-access_project_issue_manager,project.issue,model_project_issue,sales_team.group_sale_manager,1,0,0,0

+access_project_issue_salesman,project.issue,model_project_issue,base.group_sale_salesman,1,0,0,0

+access_project_issue_manager,project.issue,model_project_issue,base.group_sale_manager,1,0,0,0

 access_project_issue_portal,project.issue,model_project_issue,base.group_portal,1,0,0,0

diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index f66cd1e323c..942b8e19b72 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

 access_report_intrastat_code,report.intrastat.code,model_report_intrastat_code,account.group_account_manager,1,1,1,1

 access_report_intrastat,report.intrastat,model_report_intrastat,account.group_account_manager,1,0,0,0

-access_report_intrastat_code_sale_manager,report.intrastat.code sale manager,model_report_intrastat_code,sales_team.group_sale_manager,1,1,1,1

+access_report_intrastat_code_sale_manager,report.intrastat.code sale manager,model_report_intrastat_code,base.group_sale_manager,1,1,1,1

 access_report_intrastat_code_purchase_manager,report.intrastat.code purchase manager,model_report_intrastat_code,purchase.group_purchase_manager,1,1,1,1

 access_report_intrastat_code_stock_manager,report.intrastat.code stock manager,model_report_intrastat_code,stock.group_stock_manager,1,1,1,1

diff --git a/addons/report_intrastat/views/report_intrastat_views.xml b/addons/report_intrastat/views/report_intrastat_views.xml
index 94d069d3dba..d1d36b57080 100644
--- a/addons/report_intrastat/views/report_intrastat_views.xml
+++ b/addons/report_intrastat/views/report_intrastat_views.xml
@@ -67,7 +67,7 @@
         </record>
 
         <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" 
-                parent="sales_team.menu_config_address_book" sequence="2" groups="base.group_no_one"/>
+                parent="base.menu_config_address_book" sequence="2" groups="base.group_no_one"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index cb58e4ae0b6..b78e70a0d60 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -4,7 +4,7 @@
         <record id="view_sales_config" model="ir.ui.view">
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="inherit_id" ref="sales_team.view_sale_config_settings"/>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div id="main" position="inside">
                     <group string="Products">
@@ -51,10 +51,10 @@
             </field>
         </record>
 
-        <menuitem id="sales_team.menu_sale_config" name="Configuration" parent="sales_team.menu_base_partner"
+        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
             sequence="100"/>
-        <menuitem id="sales_team.menu_sale_general_settings" name="Settings" parent="sales_team.menu_sale_config"
-            sequence="0" action="sales_team.action_sale_config" groups="base.group_system"/>
+        <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
+            sequence="0" action="base_setup.action_sale_config" groups="base.group_system"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 1e60b2dc8af..96230da61eb 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -7,7 +7,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{'search_default_partner_id': active_id, 'show_sale': True}</field>
-            <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Create a Quotation, the first step of a new sale.
@@ -40,7 +40,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="priority" eval="20"/>
-            <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <div name="button_box" position="inside">
                     <button class="oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 18338fa7476..9d307e75b14 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('sales_team.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-
         <record model="crm.team" id="sales_team.team_sales_department">
             <field name="invoiced_target">250000</field>
         </record>
@@ -316,7 +312,7 @@ Thanks!</field>
         </record>
 
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('sales_team.group_sale_salesman'))]" name="groups_id"/>
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
 
     </data>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 35ec70a15e1..9bf25d8da9d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -8,31 +8,16 @@
             the base module in order to set new groups.
         -->
         <menuitem name="Sales"
-            id="sales_team.menu_base_partner"
-            web_icon="sale,static/description/icon.png"/>
+            id="base.menu_base_partner"
+            web_icon="sale,static/description/icon.png"
+            groups="base.group_sale_salesman,base.group_sale_manager" sequence="6"/>
 
         <menuitem
-            id= "sales_team.menu_sales_config"
-            parent= "sales_team.menu_sale_config"
+            id= "base.menu_sales_config"
+            parent= "base.menu_sale_config"
             sequence= "1"
             name= "Sales"
-            groups= "sales_team.group_sale_manager,sales_team.group_sale_salesman,account.group_account_manager,account.group_account_user"/>
-
-        <menuitem id="sales_team.menu_product" name="Product Variants" parent="sales_team.menu_base_partner" sequence="9" groups="product.group_product_variant"/>
-        <menuitem id="sales_team.menu_sales" name="Sales" parent="sales_team.menu_base_partner" sequence="5"/>
-        <menuitem action="product.product_template_action" id="sales_team.menu_product_template_action" parent="sales_team.menu_sales" sequence="13" />
-        <menuitem id="sale.prod_config_main" name="Products" parent="sales_team.menu_sale_config" sequence="2"/>
-        <menuitem action="product.attribute_action" id="menu_attribute_action" parent="sale.prod_config_main" sequence="4" groups="product.group_product_variant"/>
-        <menuitem action="product.variants_action" id="menu_variants_action" parent="sale.prod_config_main" sequence="5" groups="product.group_product_variant"/>
-        <menuitem id="product.menu_products" action="product.product_normal_action_sell" parent="sales_team.menu_sales" groups="product.group_product_variant" sequence="99"/>
-        <menuitem action="product.product_category_action_form" groups="base.group_no_one" id="menu_product_category_action_form" parent="sale.prod_config_main" sequence="2"/>
-        <menuitem id="next_id_16" name="Units of Measure" parent="sale.prod_config_main" sequence="30" groups="product.group_uom"/>
-        <menuitem action="product.product_uom_form_action" id="menu_product_uom_form_action" parent="sale.prod_config_main" sequence="6" groups="product.group_uom"/>
-        <menuitem action="product.product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="sale.prod_config_main" sequence="7" groups="base.group_no_one"/>
-        <menuitem id="sales_team.menu_sale_config_sales" name="Configuration" parent="sales_team.menu_base_partner" sequence="100"/>
-        <menuitem id="menu_product_pricelist_main" name="Pricelists" parent="sales_team.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/>
-        <menuitem action="product.product_pricelist_action2" id="menu_product_pricelist_action2" parent="menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
-
+            groups= "base.group_sale_manager,base.group_sale_salesman,account.group_account_manager,account.group_account_user"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -450,8 +435,8 @@
         </record>
 
         <menuitem action="action_orders"
-            id="menu_sale_order" parent="sales_team.menu_sales"
-            sequence="12" groups="sales_team.group_sale_salesman,sales_team.group_sale_manager"/>
+            id="menu_sale_order" parent="base.menu_sales"
+            sequence="12" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_orders_to_invoice" model="ir.actions.act_window">
             <field name="name">Sales to Invoice</field>
@@ -472,7 +457,7 @@
             </field>
         </record>
         <menuitem name="Invoicing"
-            id="menu_sale_invoicing" parent="sales_team.menu_base_partner"
+            id="menu_sale_invoicing" parent="base.menu_base_partner"
             sequence="5"/>
         <menuitem action="action_orders_to_invoice"
             id="menu_sale_order_invoice" parent="sale.menu_sale_invoicing"
@@ -527,7 +512,7 @@
         </record>
 
         <menuitem id="menu_sale_quotations"
-                action="action_quotations" parent="sales_team.menu_sales"
+                action="action_quotations" parent="base.menu_sales"
                 sequence="11"/>
 
         <record id="view_order_line_tree" model="ir.ui.view">
@@ -582,7 +567,7 @@
             <field name="name">product.product.sale.order</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <div name="button_box" position="inside">
                     <button class="oe_stat_button" name="%(action_product_sale_list)d"
@@ -597,7 +582,7 @@
             <field name="name">product.template.sale.order.button</field>
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <div name="button_box" position="inside">
                     <button class="oe_stat_button" name="action_view_sales"
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 2d03eff259e..6804a97c81e 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,51 +1,42 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_sale_order,sale.order,model_sale_order,sales_team.group_sale_salesman,1,1,1,0

-access_sale_order_line,sale.order.line,model_sale_order_line,sales_team.group_sale_salesman,1,1,1,1

+access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0

+access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1

 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0

-access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,sales_team.group_sale_salesman,1,1,1,0

-access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,sales_team.group_sale_salesman,1,1,1,0

-access_account_invoice_manager,account_invoice manager,account.model_account_invoice,sales_team.group_sale_manager,1,1,1,1

-access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,sales_team.group_sale_salesman,1,1,1,0

-access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,sales_team.group_sale_salesman,1,0,0,0

-access_account_analytic_tag_sale_salesman,account.analytic.tag.sale.salesman,analytic.model_account_analytic_tag,sales_team.group_sale_salesman,1,0,0,0

-access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,sales_team.group_sale_salesman,1,1,1,0

-access_sale_order_manager,sale.order.manager,model_sale_order,sales_team.group_sale_manager,1,1,1,1

+access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0

+access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0

+access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,1

+access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0

+access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0

+access_account_analytic_tag_sale_salesman,account.analytic.tag.sale.salesman,analytic.model_account_analytic_tag,base.group_sale_salesman,1,0,0,0

+access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0

+access_sale_order_manager,sale.order.manager,model_sale_order,base.group_sale_manager,1,1,1,1

 access_sale_order_accountant,sale.order.accountant,model_sale_order,account.group_account_user,1,1,0,0

-access_sale_report_salesman,sale.report,model_sale_report,sales_team.group_sale_salesman,1,1,1,0

-access_sale_report_manager,sale.report,model_sale_report,sales_team.group_sale_manager,1,1,1,1

-access_ir_property_sales,ir.property.sales,base.model_ir_property,sales_team.group_sale_salesman,1,1,1,1

-access_sale_account_journal,account.journal sale order.user,account.model_account_journal,sales_team.group_sale_salesman,1,0,0,0

-access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,sales_team.group_sale_salesman,1,0,0,0

-access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,sales_team.group_sale_manager,1,1,1,0

-access_product_template_sale_user,product.template sale use,product.model_product_template,sales_team.group_sale_salesman,1,0,0,0

-access_product_product_sale_user,product.product sale use,product.model_product_product,sales_team.group_sale_salesman,1,0,0,0

-access_account_tax_user,account.tax.user,account.model_account_tax,sales_team.group_sale_salesman,1,0,0,0

-access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,sales_team.group_sale_salesman,1,1,1,0

-access_ir_attachment_manager,ir.attachment.manager,base.model_ir_attachment,sales_team.group_sale_manager,1,1,1,1

-access_product_uom_user,product.uom.user,product.model_product_uom,sales_team.group_sale_salesman,1,0,0,0

-access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,sales_team.group_sale_salesman,1,0,0,0

-access_account_account_salesman,account_account salesman,account.model_account_account,sales_team.group_sale_salesman,1,0,0,0

-access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,sales_team.group_sale_manager,1,1,1,1

-access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,sales_team.group_sale_manager,1,1,1,1

-access_product_category_sale_manager,product.category salemanager,product.model_product_category,sales_team.group_sale_manager,1,1,1,1

-access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,sales_team.group_sale_salesman,1,0,0,0

-access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,sales_team.group_sale_manager,1,1,1,1

-access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,sales_team.group_sale_manager,1,1,1,1

-access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,sales_team.group_sale_manager,1,1,1,0

-access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,sales_team.group_sale_salesman,1,0,0,0

+access_sale_report_salesman,sale.report,model_sale_report,base.group_sale_salesman,1,1,1,0

+access_sale_report_manager,sale.report,model_sale_report,base.group_sale_manager,1,1,1,1

+access_ir_property_sales,ir.property.sales,base.model_ir_property,base.group_sale_salesman,1,1,1,1

+access_sale_account_journal,account.journal sale order.user,account.model_account_journal,base.group_sale_salesman,1,0,0,0

+access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.group_sale_salesman,1,0,0,0

+access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,base.group_sale_manager,1,1,1,0

+access_product_template_sale_user,product.template sale use,product.model_product_template,base.group_sale_salesman,1,0,0,0

+access_product_product_sale_user,product.product sale use,product.model_product_product,base.group_sale_salesman,1,0,0,0

+access_account_tax_user,account.tax.user,account.model_account_tax,base.group_sale_salesman,1,0,0,0

+access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,base.group_sale_salesman,1,1,1,0

+access_ir_attachment_manager,ir.attachment.manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1

+access_product_uom_user,product.uom.user,product.model_product_uom,base.group_sale_salesman,1,0,0,0

+access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,base.group_sale_salesman,1,0,0,0

+access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0

+access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,base.group_sale_manager,1,1,1,1

+access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1

+access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1

+access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0

+access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1

+access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1

+access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0

+access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0

 access_sale_order_invoicing_payments,sale.order,model_sale_order,account.group_account_invoice,1,1,0,0

 access_sale_order_line_invoicing_payments,sale.order.line,model_sale_order_line,account.group_account_invoice,1,1,0,0

-report_layout_category_1,report_layout_category_1,model_sale_layout_category,sales_team.group_sale_manager,1,1,1,1

+report_layout_category_1,report_layout_category_1,model_sale_layout_category,base.group_sale_manager,1,1,1,1

 report_layout_category_2,report_layout_category_2,model_sale_layout_category,account.group_account_manager,1,1,1,1

-report_layout_category_3,report_layout_category_3,model_sale_layout_category,sales_team.group_sale_salesman,1,1,1,0

-report_layout_category_4,report_layout_category_4,model_sale_layout_category,sales_team.group_sale_salesman_all_leads,1,1,1,0

+report_layout_category_3,report_layout_category_3,model_sale_layout_category,base.group_sale_salesman,1,1,1,0

+report_layout_category_4,report_layout_category_4,model_sale_layout_category,base.group_sale_salesman_all_leads,1,1,1,0

 report_layout_category_5,report_layout_category_5,model_sale_layout_category,account.group_account_invoice,1,0,0,0

-access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,sales_team.group_sale_manager,1,1,1,1

-access_product_price_history_salemanager,prices.history sale manager,product.model_product_price_history,sales_team.group_sale_manager,1,1,1,1

-access_product_template_sale_manager,product.template salemanager,model_product_template,sales_team.group_sale_manager,1,1,1,1

-access_product_product_sale_manager,product.product salemanager,model_product_product,sales_team.group_sale_manager,1,1,1,1

-access_product_category_sale_manager,product.category salemanager,product.model_product_category,sales_team.group_sale_manager,1,1,1,1

-access_product_attribute_sale_manager,product.attribute manager,product.model_product_attribute,sales_team.group_sale_manager,1,1,1,1

-access_product_attribute_value_sale_manager,product.attribute manager value,product.model_product_attribute_value,sales_team.group_sale_manager,1,1,1,1

-access_product_attribute_price_sale_manager,product.attribute manager price,product.model_product_attribute_price,sales_team.group_sale_manager,1,1,1,1

-access_product_attribute_line_sale_manager,product.attribute manager line,product.model_product_attribute_line,sales_team.group_sale_manager,1,1,1,1

diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 863bffcf104..3d235ee1f55 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,25 +2,25 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="sales_team.group_sale_salesman" model="res.groups">
+    <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">See Own Documents</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
-    <record id="sales_team.group_sale_salesman_all_leads" model="res.groups">
+    <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">See All Documents</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
         <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
-    <record id="sales_team.group_sale_manager" model="res.groups">
+    <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
@@ -64,11 +64,11 @@
     <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
-    <record model="ir.ui.menu" id="sales_team.menu_base_partner">
-        <field eval="[(4, ref('sales_team.group_sale_salesman'))]" name="groups_id"/>
+    <record model="ir.ui.menu" id="base.menu_base_partner">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>
-    <record model="ir.ui.menu" id="sales_team.menu_sale_config">
-        <field eval="[(4, ref('sales_team.group_sale_manager'))]" name="groups_id"/>
+    <record model="ir.ui.menu" id="base.menu_sale_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
 </data>
@@ -102,41 +102,41 @@
         <field name="name">Personal Orders</field>
         <field ref="model_sale_order" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
     <record id="sale_order_see_all" model="ir.rule">
         <field name="name">All Orders</field>
         <field ref="model_sale_order" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="sale_order_report_personal_rule" model="ir.rule">
         <field name="name">Personal Orders Analysis</field>
         <field ref="model_sale_report" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="sale_order_report_see_all" model="ir.rule">
         <field name="name">All Orders Analysis</field>
         <field ref="model_sale_report" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="sale_order_line_personal_rule" model="ir.rule">
         <field name="name">Personal Order Lines</field>
         <field ref="model_sale_order_line" name="model_id"/>
         <field name="domain_force">['|',('order_id.user_id','=',user.id),('order_id.user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="sale_order_line_see_all" model="ir.rule">
         <field name="name">All Orders Lines</field>
         <field ref="model_sale_order_line" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
 </data>
diff --git a/addons/sale/tests/test_sale_common.py b/addons/sale/tests/test_sale_common.py
index 8622da2fcd4..fea031a4308 100644
--- a/addons/sale/tests/test_sale_common.py
+++ b/addons/sale/tests/test_sale_common.py
@@ -7,8 +7,8 @@ class TestSale(AccountingTestCase):
     def setUp(self):
         super(TestSale, self).setUp()
         # some users
-        group_manager = self.env.ref('sales_team.group_sale_manager')
-        group_user = self.env.ref('sales_team.group_sale_salesman')
+        group_manager = self.env.ref('base.group_sale_manager')
+        group_user = self.env.ref('base.group_sale_salesman')
         self.manager = self.env['res.users'].create({
             'name': 'Andrew Manager',
             'login': 'manager',
diff --git a/addons/sale/views/sale_layout_category_view.xml b/addons/sale/views/sale_layout_category_view.xml
index 189f5532305..c547bc195dd 100644
--- a/addons/sale/views/sale_layout_category_view.xml
+++ b/addons/sale/views/sale_layout_category_view.xml
@@ -54,7 +54,7 @@
         <menuitem
             action="report_configuration_action"
             id="Report_configuration"
-            parent="sales_team.menu_sales_config"
+            parent="base.menu_sales_config"
             sequence="2"
             name="Report Layout Categories"
             groups="sale.group_sale_layout"
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 436acda185a..d0f97986be5 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -48,7 +48,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="groups_id" eval="[(4,ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
         <!-- TODO: check if we need this -->
diff --git a/addons/sale_crm/views/crm_lead_views.xml b/addons/sale_crm/views/crm_lead_views.xml
index bf39a04d001..5d42bcf675f 100644
--- a/addons/sale_crm/views/crm_lead_views.xml
+++ b/addons/sale_crm/views/crm_lead_views.xml
@@ -6,7 +6,11 @@
             This menu item's purpose is to rename it into 'Sales' in the 
             case that CRM was installed after Sales
         -->
-        <menuitem name="Sales" id="sales_team.menu_base_partner"/>
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            groups="base.group_sale_manager,base.group_sale_salesman"
+            web_icon="sale,static/description/icon.png"
+            sequence="6"/>
 
         <record id="crm_case_form_view_oppor" model="ir.ui.view">
             <field name="name">crm.lead.oppor.inherited.crm</field>
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index 3cd4aca1e81..a0f117b61e5 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,sales_team.group_sale_salesman,1,0,0,0

+access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0

 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0

 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0

diff --git a/addons/sale_stock/security/ir.model.access.csv b/addons/sale_stock/security/ir.model.access.csv
index be838774d8a..3d7f9d02fb1 100644
--- a/addons/sale_stock/security/ir.model.access.csv
+++ b/addons/sale_stock/security/ir.model.access.csv
@@ -1,17 +1,17 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,sales_team.group_sale_salesman,1,1,1,0
-access_stock_move_salesman,stock_move salesman,stock.model_stock_move,sales_team.group_sale_salesman,1,1,1,0
-access_stock_move_manager,stock_move manager,stock.model_stock_move,sales_team.group_sale_manager,1,1,1,1
-access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,sales_team.group_sale_salesman,1,1,1,0
-access_procurement_manager,procurement.order manager,procurement.model_procurement_order,sales_team.group_sale_manager,1,1,1,1
+access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,base.group_sale_salesman,1,1,1,0
+access_stock_move_salesman,stock_move salesman,stock.model_stock_move,base.group_sale_salesman,1,1,1,0
+access_stock_move_manager,stock_move manager,stock.model_stock_move,base.group_sale_manager,1,1,1,1
+access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,base.group_sale_salesman,1,1,1,0
+access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,1,1,1,1
 access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0
 access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0
-access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,sales_team.group_sale_manager,1,1,1,1
-access_product_packaging_user,product.packaging.user,product.model_product_packaging,sales_team.group_sale_salesman,1,1,1,0
-access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,sales_team.group_sale_manager,1,0,0,0
-access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,sales_team.group_sale_salesman,1,0,0,0
-access_stock_location_user,stock.location.user,stock.model_stock_location,sales_team.group_sale_salesman,1,0,0,0
-access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,sales_team.group_sale_manager,1,1,1,1
-access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sales_team.group_sale_salesman,1,0,0,0
+access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
+access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
+access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
+access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
+access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
+access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
+access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
 access_account_partial_reconcile,account.partial.reconcile,account.model_account_partial_reconcile,stock.group_stock_manager,1,1,1,1
 access_account_journal,account.journal,account.model_account_journal,stock.group_stock_manager,1,1,0,0
\ No newline at end of file
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index 5ac1c6aacad..f8d3e79ed14 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <menuitem id="base.menu_aftersale" name="After-Sale"
-            groups="sales_team.group_sale_salesman"
-            parent="sales_team.menu_base_partner" sequence="5" />
+            groups="base.group_sale_salesman"
+            parent="base.menu_base_partner" sequence="5" />
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_aftersale" sequence="1"/>
         
         <record id="stock_location_route_form_view_inherit_sale_stock" model="ir.ui.view">
diff --git a/addons/sales_team/__openerp__.py b/addons/sales_team/__openerp__.py
index a487d301098..0e819a8b558 100644
--- a/addons/sales_team/__openerp__.py
+++ b/addons/sales_team/__openerp__.py
@@ -16,7 +16,6 @@ Using this application you can manage Sales Team  with CRM and/or Sales
              'data/sales_team_data.xml',
              'views/crm_team_views.xml',
              'views/sales_team_dashboard.xml',
-             'views/res_config_view.xml',
              ],
     'qweb': [
         "static/src/xml/sales_team_dashboard.xml",
@@ -24,5 +23,5 @@ Using this application you can manage Sales Team  with CRM and/or Sales
     'demo': ['data/sales_team_demo.xml'],
     'css': ['static/src/css/sales_team.css'],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
 }
diff --git a/addons/sales_team/data/sales_team_data.xml b/addons/sales_team/data/sales_team_data.xml
index c460851f1d8..620d0fe4d74 100644
--- a/addons/sales_team/data/sales_team_data.xml
+++ b/addons/sales_team/data/sales_team_data.xml
@@ -6,12 +6,4 @@
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
-
-    <record model="res.groups" id="sales_team.group_sale_salesman">
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record model="res.groups" id="sales_team.group_sale_manager">
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
 </odoo>
diff --git a/addons/sales_team/data/sales_team_demo.xml b/addons/sales_team/data/sales_team_demo.xml
index e81300f8844..552e89b93f0 100644
--- a/addons/sales_team/data/sales_team_demo.xml
+++ b/addons/sales_team/data/sales_team_demo.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('sales_team.group_sale_salesman'))]"/>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
         <record id="team_sales_department" model="crm.team">
diff --git a/addons/sales_team/models/__init__.py b/addons/sales_team/models/__init__.py
index ae1e26c5c55..b83b75ed317 100644
--- a/addons/sales_team/models/__init__.py
+++ b/addons/sales_team/models/__init__.py
@@ -3,4 +3,3 @@
 import crm_team
 import res_partner
 import res_users
-import res_config
\ No newline at end of file
diff --git a/addons/sales_team/models/res_config.py b/addons/sales_team/models/res_config.py
deleted file mode 100644
index 8b21d390597..00000000000
--- a/addons/sales_team/models/res_config.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import models
-
-# Empty class but required since it's overridden by sale & crm
-class SaleConfigSettings(models.TransientModel):
-
-    _name = 'sale.config.settings'
-    _inherit = 'res.config.settings'
diff --git a/addons/sales_team/security/ir.model.access.csv b/addons/sales_team/security/ir.model.access.csv
index 238d6611813..9fc0846e845 100644
--- a/addons/sales_team/security/ir.model.access.csv
+++ b/addons/sales_team/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_team,crm.team,model_crm_team,base.group_user,1,0,0,0
-access_crm_team_user,crm.team.user,model_crm_team,sales_team.group_sale_salesman,1,0,0,0
-access_crm_team_manager,crm.team.manager,model_crm_team,sales_team.group_sale_manager,1,1,1,1
+access_crm_team_user,crm.team.user,model_crm_team,base.group_sale_salesman,1,0,0,0
+access_crm_team_manager,crm.team.manager,model_crm_team,base.group_sale_manager,1,1,1,1
diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml
index 7c6dbecd011..067c946635b 100644
--- a/addons/sales_team/security/sales_team_security.xml
+++ b/addons/sales_team/security/sales_team_security.xml
@@ -1,34 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="0">
-
-        <record id="sales_team.group_sale_salesman" model="res.groups">
-            <field name="name">User</field>
-        </record>
-
-        <record id="sales_team.group_sale_manager" model="res.groups">
-            <field name="name">Manager</field>
-            <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
-        </record>
-
-        <record id="base.default_user" model="res.users">
-            <field name="groups_id" eval="[(4,ref('sales_team.group_sale_manager'))]"/>
-        </record>
-
         <record model="ir.rule" id="sale_team_comp_rule">
             <field name="name">Sales Team multi-company</field>
             <field name="model_id" ref="model_crm_team"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
-
-        <record model="ir.ui.menu" id="sales_team.menu_sale_config">
-            <field name="name">Configuration</field>
-            <field eval="[(6,0,[ref('base.group_system'), ref('base.group_partner_manager')])]" name="groups_id"/>
-        </record>
-
-        <record model="ir.ui.menu" id="menu_config_address_book">
-            <field name="name">Contacts</field>
-            <field eval="[(6,0,[ref('base.group_system'), ref('base.group_partner_manager')])]" name="groups_id"/>
-        </record>
     </data>
 </odoo>
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index 5f8d9881001..723c0c53ffa 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -2,28 +2,9 @@
 <odoo>
     <data>
         <menuitem name="Sales"
-            id="menu_base_partner"
+            id="base.menu_base_partner"
             icon="fa-credit-card"
-            groups="group_sale_salesman,group_sale_manager" sequence="6"/>
-
-        <menuitem id="menu_sales" name="Sales" parent="menu_base_partner" sequence="5"/>
-        <menuitem id="menu_sale_config" name="Configuration" parent="menu_base_partner"
-        sequence="100" groups="group_sale_manager"/>
-        <menuitem id="menu_partner_form" parent="menu_sales" action="base.action_partner_form" sequence="3"/>
-
-        <menuitem id="menu_config_address_book" parent="menu_sale_config" name="Contacts" sequence="4" groups="base.group_system"/>
-            <menuitem action="base.action_partner_category_form" id="menu_partner_category_form" name="Contact Tags" sequence="1" parent="menu_config_address_book" groups="base.group_no_one"/>
-            <menuitem action="base.action_partner_title_contact" id="menu_partner_title_contact" name="Contact Titles" parent="menu_config_address_book" sequence="3" groups="base.group_no_one"/>
-            <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="5" groups="base.group_no_one"/>
-                <menuitem action="base.action_country" id="menu_country_partner" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
-                <menuitem action="base.action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="3" groups="base.group_no_one"/>
-                <menuitem action="base.action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
-                <menuitem action="base.action_currency_form" id="base.menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
-            <menuitem id="menu_config_bank_accounts" name="Bank Accounts" parent="menu_config_address_book" sequence="6" groups="base.group_no_one"/>
-                <menuitem action="base.action_res_bank_form" id="base.menu_action_res_bank_form" parent="menu_config_bank_accounts" sequence="1" groups="base.group_no_one"/>
-                <menuitem action="base.action_res_partner_bank_account_form" id="base.menu_action_res_partner_bank_form" parent="menu_config_bank_accounts" groups="base.group_no_one" sequence="2"/>
-
-    
+            groups="base.group_sale_salesman,base.group_sale_manager" sequence="6"/>
 
         <!-- Cateamions Search view -->
         <record id="crm_team_salesteams_search" model="ir.ui.view">
@@ -155,7 +136,7 @@
             </field>
         </record>
 
-        <menuitem id="sales_team.menu_sales_team_act" action="crm_team_salesteams_act" sequence="1" parent="sales_team.menu_base_partner" name="Dashboard"/>
+        <menuitem id="sales_team.menu_sales_team_act" action="crm_team_salesteams_act" sequence="1" parent="base.menu_base_partner" name="Dashboard"/>
 
         <!-- add css / js -->
         <template id="assets_backend" name="sales_team assets" inherit_id="web.assets_backend">
@@ -167,7 +148,7 @@
             </xpath>
         </template>
 
-        <menuitem id="base.menu_sale_report" name="Reports" parent="sales_team.menu_base_partner" sequence="99" groups="sales_team.group_sale_manager"/>
+        <menuitem id="base.menu_sale_report" name="Reports" parent="base.menu_base_partner" sequence="99" groups="base.group_sale_manager"/>
 
         <record id="sales_team_config_action" model="ir.actions.act_window">
             <field name="name">Sales Teams</field>
@@ -189,7 +170,7 @@
 
         <menuitem name="Sales Teams"
             id="base.sales_team_config"
-            parent="sales_team.menu_sale_config"
+            parent="base.menu_sale_config"
             action="sales_team_config_action"/>
 
     </data>
diff --git a/addons/sales_team/views/res_config_view.xml b/addons/sales_team/views/res_config_view.xml
deleted file mode 100644
index 53eabbe07f1..00000000000
--- a/addons/sales_team/views/res_config_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- Sale config wizard -->
-    <record id="view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale settings</field>
-        <field name="model">sale.config.settings</field>
-        <field name="arch" type="xml">
-            <form string="Configure Sales" class="oe_form_configuration">
-                <header>
-                    <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                    <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-                </header>
-                <div id="main"/>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.config.settings</field>
-        <field name="view_id" ref="view_sale_config_settings"/>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index ac523982e88..3e31ba24578 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -19,7 +19,7 @@ access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.gro
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
 access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
-access_stock_location_sale_manager,stock.location sale manager,model_stock_location,sales_team.group_sale_manager,1,0,0,0
+access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0
 access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
 access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
@@ -46,16 +46,16 @@ access_stock_quant_package_stock_manager,stock.quant.package stock manager,model
 access_stock_quant_package_stock_user,stock.quant.package stock user,model_stock_quant_package,stock.group_stock_user,1,1,1,1
 access_procurement_rule_user,procurement_rule user,model_procurement_rule,stock.group_stock_user,1,0,0,0
 access_procurement_rule_manager,procurement_rule manager,model_procurement_rule,stock.group_stock_manager,1,1,1,1
-access_procurement_rule_salemanager,procurement_rule salemanager,model_procurement_rule,sales_team.group_sale_manager,1,1,1,1
+access_procurement_rule_salemanager,procurement_rule salemanager,model_procurement_rule,base.group_sale_manager,1,1,1,1
 access_procurement_rule_stock_manager,procurement_rule stock manager,model_procurement_rule,stock.group_stock_manager,1,1,1,1
 access_stock_location_path_user,stock location path user,model_stock_location_path,stock.group_stock_user,1,0,0,0
 access_stock_location_path_internal_user,stock location path internal user,model_stock_location_path,base.group_user,1,0,0,0
-access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,sales_team.group_sale_manager,1,1,1,1
+access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,base.group_sale_manager,1,1,1,1
 access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
-access_stock_location_path,stock.location.path,model_stock_location_path,sales_team.group_sale_salesman,1,0,0,0
+access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
 access_stock_location_route_stock_manager,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,1,1,1
 access_stock_location_route,stock.location.route,model_stock_location_route,base.group_user,1,0,0,0
-access_procurement_rule,procurement.rule.flow,model_procurement_rule,sales_team.group_sale_salesman,1,0,0,0
+access_procurement_rule,procurement.rule.flow,model_procurement_rule,base.group_sale_salesman,1,0,0,0
 access_procurement_rule_internal,procurement.rule.flow internal,model_procurement_rule,base.group_user,1,0,0,0
 access_stock_pack_operation_manager,stock.pack.operation manager,model_stock_pack_operation,stock.group_stock_manager,1,1,1,1
 access_stock_pack_operation_user,stock.pack.operation user,model_stock_pack_operation,stock.group_stock_user,1,1,1,1
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 9de4d9f99f5..41c0a7346e4 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -17,7 +17,7 @@ e.g. To have an invoice generated automatically periodically:
     * Define a subscription whose source document is the document defined as
       above. Specify the interval information and partner to be invoiced.
     """,
-    'depends': ['base', 'sales_team'],
+    'depends': ['base'],
     'data': [
         'security/ir.model.access.csv',
         'views/subscription_view.xml'
diff --git a/addons/subscription/data/subscription_demo.xml b/addons/subscription/data/subscription_demo.xml
index a717909a98b..b9ab60a149d 100644
--- a/addons/subscription/data/subscription_demo.xml
+++ b/addons/subscription/data/subscription_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <odoo>
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('sales_team.group_sale_salesman'))]" name="groups_id"/>
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
     
         <record id="subscription_document_partner0" model="subscription.document">
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 7c879627d00..5d19f4d24c8 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,sales_team.group_sale_manager,1,1,1,1

-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,sales_team.group_sale_salesman,1,1,1,1

-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,sales_team.group_sale_salesman,1,1,1,1

-access_subscription_document_user,subscription.document user,model_subscription_document,sales_team.group_sale_salesman,1,1,1,1

-access_res_partner_user,res.partner.user,base.model_res_partner,sales_team.group_sale_salesman,1,1,1,1

-access_ir_cron_user,ir.cron.user,base.model_ir_cron,sales_team.group_sale_salesman,1,1,1,1

+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_sale_manager,1,1,1,1

+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_sale_salesman,1,1,1,1

+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_sale_salesman,1,1,1,1

+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_sale_salesman,1,1,1,1

+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_sale_salesman,1,1,1,1

+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_sale_salesman,1,1,1,1

diff --git a/addons/utm/models/utm.py b/addons/utm/models/utm.py
index 7100a63e558..8e98c95b2ac 100644
--- a/addons/utm/models/utm.py
+++ b/addons/utm/models/utm.py
@@ -61,7 +61,7 @@ class UtmMixin(models.AbstractModel):
         values = super(UtmMixin, self).default_get(fields)
 
         # We ignore UTM for salemen, except some requests that could be done as superuser_id to bypass access rights.
-        if self.env.uid != SUPERUSER_ID and self.env.user.has_group('sales_team.group_sale_salesman'):
+        if self.env.uid != SUPERUSER_ID and self.env.user.has_group('base.group_sale_salesman'):
             return values
 
         for url_param, field_name, cookie_name in self.env['utm.mixin'].tracking_fields():
diff --git a/addons/website_customer/security/ir.model.access.csv b/addons/website_customer/security/ir.model.access.csv
index 1615f7348a6..9526a5ced8f 100644
--- a/addons/website_customer/security/ir.model.access.csv
+++ b/addons/website_customer/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 res_partner_tag_sale_manager,res.partner.tag.sale.manager,model_res_partner_tag,,1,0,0,0
-res_partner_tag_sale_manager_edition,res.partner.tag.sale.manager.edition,model_res_partner_tag,sales_team.group_sale_manager,1,1,1,1
\ No newline at end of file
+res_partner_tag_sale_manager_edition,res.partner.tag.sale.manager.edition,model_res_partner_tag,base.group_sale_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/website_customer/views/website_customer_view.xml b/addons/website_customer/views/website_customer_view.xml
index 00915f95e41..6442c1b7f36 100644
--- a/addons/website_customer/views/website_customer_view.xml
+++ b/addons/website_customer/views/website_customer_view.xml
@@ -63,7 +63,7 @@
             id="menu_partner_tag_form"
             name="Website Tags"
             sequence="2"
-            parent="sales_team.menu_config_address_book"
+            parent="base.menu_config_address_book"
             groups="base.group_no_one"
         />
     </data>
diff --git a/addons/website_quote/security/ir.model.access.csv b/addons/website_quote/security/ir.model.access.csv
index 1b083313179..88137036caa 100644
--- a/addons/website_quote/security/ir.model.access.csv
+++ b/addons/website_quote/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_quote_template,sale.quote.template,model_sale_quote_template,sales_team.group_sale_salesman,1,0,0,0
-access_sale_quote_template_manager,sale.quote.template,model_sale_quote_template,sales_team.group_sale_manager,1,1,1,1
-access_sale_quote_line,sale.quote.line,model_sale_quote_line,sales_team.group_sale_salesman,1,0,0,0
-access_sale_quote_line_manager,sale.quote.line,model_sale_quote_line,sales_team.group_sale_manager,1,1,1,1
-access_sale_quote_option,sale.quote.option,model_sale_quote_option,sales_team.group_sale_salesman,1,0,0,0
-access_sale_quote_option_manager,sale.quote.option,model_sale_quote_option,sales_team.group_sale_manager,1,1,1,1
-access_sale_order_option,sale.order.option,model_sale_order_option,sales_team.group_sale_salesman,1,1,1,1
+access_sale_quote_template,sale.quote.template,model_sale_quote_template,base.group_sale_salesman,1,0,0,0
+access_sale_quote_template_manager,sale.quote.template,model_sale_quote_template,base.group_sale_manager,1,1,1,1
+access_sale_quote_line,sale.quote.line,model_sale_quote_line,base.group_sale_salesman,1,0,0,0
+access_sale_quote_line_manager,sale.quote.line,model_sale_quote_line,base.group_sale_manager,1,1,1,1
+access_sale_quote_option,sale.quote.option,model_sale_quote_option,base.group_sale_salesman,1,0,0,0
+access_sale_quote_option_manager,sale.quote.option,model_sale_quote_option,base.group_sale_manager,1,1,1,1
+access_sale_order_option,sale.order.option,model_sale_order_option,base.group_sale_salesman,1,1,1,1
 access_sale_order_option_all,sale.order.option,model_sale_order_option,,1,0,0,0
diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index d459d6a6ecd..0a597d83250 100644
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -190,6 +190,6 @@
             </field>
         </record>
 
-        <menuitem action="action_sale_quotation_template" id="menu_sale_quote_template" parent="sales_team.menu_sales_config" sequence="1" name="Quotation Templates" groups="sales_team.group_sale_salesman,sales_team.group_sale_manager"/>
+        <menuitem action="action_sale_quotation_template" id="menu_sale_quote_template" parent="base.menu_sales_config" sequence="1" name="Quotation Templates" groups="base.group_sale_salesman,base.group_sale_manager"/>
     </data>
 </openerp>
diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv
index 26435a07e2c..2c27cdae6e1 100644
--- a/addons/website_sale/security/ir.model.access.csv
+++ b/addons/website_sale/security/ir.model.access.csv
@@ -2,7 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_product_product_public,product.product.public,product.model_product_product,,1,0,0,0
 access_product_template_public,product.template.public,product.model_product_template,,1,0,0,0
 access_product_category_public,product.category.public,product.model_product_category,,1,0,0,0
-access_product_category_pos_manager,product.public.category manager,model_product_public_category,sales_team.group_sale_manager,1,1,1,1
+access_product_category_pos_manager,product.public.category manager,model_product_public_category,base.group_sale_manager,1,1,1,1
 access_product_public_category_public,product.category.public,model_product_public_category,,1,0,0,0
 access_product_pricelist_public,product.pricelist.public,product.model_product_pricelist,,1,0,0,0
 access_product_pricelist_item_public,product.pricelist.item.public,product.model_product_pricelist_item,,1,0,0,0
@@ -13,7 +13,7 @@ access_product_attribute_value_public,product.attribute value public,product.mod
 access_product_attribute_price_public,product.attribute price public,product.model_product_attribute_price,,1,0,0,0
 access_product_attribute_line_public,product.attribute line public,product.model_product_attribute_line,,1,0,0,0
 access_website_pricelist,website_pricelist,model_website_pricelist,,1,0,0,0
-access_website_pricelist_sale_manager,website_pricelist,model_website_pricelist,,sales_team.group_sale_manager,1,1,1,1
+access_website_pricelist_sale_manager,website_pricelist,model_website_pricelist,,base.group_sale_manager,1,1,1,1
 access_fiscal_position_public,fiscal position public,account.model_account_fiscal_position,base.group_portal,1,0,0,0
 access_payment_term,payment term public,account.model_account_payment_term,base.group_portal,1,0,0,0
 access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_public,1,0,0,0
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index c08bb3a09a8..38f3767d00c 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -82,7 +82,7 @@
       </a>
   </div>
   <t t-if="show_publish">
-    <div id="website_published_button" class="" groups="sales_team.group_sale_manager">
+    <div id="website_published_button" class="" groups="base.group_sale_manager">
         <t t-call="website.publish_management">
           <t t-set="object" t-value="product"/>
           <t t-set="publish_edit" t-value="True"/>
@@ -197,7 +197,7 @@
                 <div class="text-center text-muted">
                   <h3 class="css_editable_display">No product defined.</h3>
                   <t groups="base.group_website_publisher">
-                    <p groups="sales_team.group_sale_manager">Use the <i>'Content'</i> top menu to create a new product.</p>
+                    <p groups="base.group_sale_manager">Use the <i>'Content'</i> top menu to create a new product.</p>
                   </t>
                 </div>
               </t>
@@ -353,7 +353,7 @@
               <t t-call="website_sale.search"/>
             </div>
             <div id="website_published_button" class="col-sm-3">
-                <t t-call="website.publish_management" groups="sales_team.group_sale_manager">
+                <t t-call="website.publish_management" groups="base.group_sale_manager">
                   <t t-set="object" t-value="product"/>
                   <t t-set="publish_edit" t-value="True"/>
                   <t t-set="action" t-value="'product.product_template_action'"/>
@@ -1488,7 +1488,7 @@
 
 
 <!-- User Navbar -->
-<template id="content_new_product" inherit_id="website.user_navbar" groups="sales_team.group_sale_manager">
+<template id="content_new_product" inherit_id="website.user_navbar" groups="base.group_sale_manager">
     <xpath expr="//div[@id='o_website_add_page_modal']//ul" position="inside">
         <li><a id="create-new-product" href="#" data-action="new_product"><i class="fa fa-shopping-cart"/><p>New Product</p></a></li>
     </xpath>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index b29581d6b58..6d27926f570 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -116,7 +116,7 @@
           </p>
         </field>
     </record>
-    <menuitem action="product_public_category_action" id="menu_product_public_category" parent="sale.prod_config_main" sequence="2" />
+    <menuitem action="product_public_category_action" id="menu_product_public_category" parent="product.prod_config_main" sequence="2" />
     <menuitem action="product_public_category_action" id="menu_product_public_category_product_catalog" parent="product.product_parameters_menu" sequence="2"/>
 
     <record id="website_sale_pricelists_by_website" model="ir.actions.act_window">
@@ -127,7 +127,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" eval="False"/>
     </record>
-    <menuitem action="website_sale_pricelists_by_website" id="menu_website_sale_pricelists" parent="sale.menu_product_pricelist_main" sequence="1" />
+    <menuitem action="website_sale_pricelists_by_website" id="menu_website_sale_pricelists" parent="product.menu_product_pricelist_main" sequence="1" />
 
      <!-- Product Public Categories -->
     <record id="website_pricelist_form_view" model="ir.ui.view">
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 4904c64618d..afde93b349d 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -1397,7 +1397,7 @@ the same convention as the method :meth:`~openerp.models.Model.write` of the ORM
     <record id="delete_cancelled_only" model="ir.rule">
         <field name="name">Only cancelled leads may be deleted</field>
         <field name="model_id" ref="crm.model_crm_lead"/>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_manager'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_manager'))]"/>
         <field name="perm_read" eval="0"/>
         <field name="perm_write" eval="0"/>
         <field name="perm_create" eval="0"/>
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 2609477556e..1eaf3b296eb 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -151,6 +151,14 @@
             <field name="category_id" ref="module_category_usability"/>
         </record>
 
+        <record model="res.groups" id="group_sale_salesman">
+            <field name="category_id" ref="module_category_sales_management"/>
+        </record>
+
+        <record model="res.groups" id="group_sale_manager">
+            <field name="category_id" ref="module_category_sales_management"/>
+        </record>
+
         <record id="group_portal" model="res.groups">
             <field name="category_id" ref="module_category_extra"/>
         </record>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index f0cb4552d24..b2b1d2b30e9 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+        <menuitem id="menu_config_bank_accounts" name="Bank Accounts" parent="base.menu_config_address_book" sequence="6" groups="base.group_no_one"/>
+
         <record id="view_res_bank_form" model="ir.ui.view">
             <field name="name">res.bank.form</field>
             <field name="model">res.bank</field>
@@ -58,6 +60,8 @@
             </field>
         </record>
 
+        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form" parent="base.menu_config_bank_accounts" sequence="1" groups="base.group_no_one"/>
+
         <record id="view_partner_bank_form" model="ir.ui.view">
             <field name="name">res.partner.bank.form</field>
             <field name="model">res.partner.bank</field>
@@ -109,6 +113,7 @@
             </field>
         </record>
 
+        <menuitem action="action_res_partner_bank_account_form" id="menu_action_res_partner_bank_form" parent="base.menu_config_bank_accounts" groups="base.group_no_one" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index c09d6f2d279..83ac7d092ce 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -589,7 +589,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
         Fetch the path to a specified configuration view and the action id to access it.
 
         :param string menu_xml_id: the xml id of the menuitem where the view is located,
-            structured as follows: module_name.menuitem_xml_id (e.g.: "sales_team.menu_sale_config")
+            structured as follows: module_name.menuitem_xml_id (e.g.: "base.menu_sale_config")
         :return tuple:
             - t[0]: string: full path to the menuitem (e.g.: "Settings/Configuration/Sales")
             - t[1]: int or long: id of the menuitem's action
@@ -630,7 +630,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
         Example of use:
         ---------------
         from openerp.addons.base.res.res_config import get_warning_config
-        raise get_warning_config(cr, _("Error: this action is prohibited. You should check the field %(field:sale.config.settings.fetchmail_lead)s in %(menu:sales_team.menu_sale_config)s."), context=context)
+        raise get_warning_config(cr, _("Error: this action is prohibited. You should check the field %(field:sale.config.settings.fetchmail_lead)s in %(menu:base.menu_sale_config)s."), context=context)
 
         This will return an exception containing the following message:
             Error: this action is prohibited. You should check the field Create leads from incoming mails in Settings/Configuration/Sales.
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index d8a6cae8b78..ed1c74319e0 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -51,6 +51,10 @@
             <field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
         </record>
 
+        <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="5" groups="base.group_no_one"/>
+
+        <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
+
         <record id="view_country_group_tree" model="ir.ui.view">
             <field name="name">res.country.group.tree</field>
             <field name="model">res.country.group</field>
@@ -85,6 +89,8 @@
             <field name="help">Display and manage the list of all countries group. You can create or delete country group to make sure the ones you are working on will be maintained.</field>
         </record>
 
+        <menuitem action="action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="3" groups="base.group_no_one"/>
+
         <!-- State -->
         <record id="view_country_state_tree" model="ir.ui.view">
             <field name="name">res.country.state.tree</field>
@@ -121,5 +127,6 @@
             <field name="help">If you are working on the American market, you can manage the different federal states you are working on from here. Each state is attached to one country.</field>
         </record>
 
+        <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml
index b1982acbfa1..3a5a8c773c4 100644
--- a/openerp/addons/base/res/res_currency_view.xml
+++ b/openerp/addons/base/res/res_currency_view.xml
@@ -105,6 +105,8 @@
             <field name="context">{'active_test': False}</field>
         </record>
 
+        <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
+
         <record id="action_currency_form_company" model="ir.actions.act_window">
             <field name="name">Currencies</field>
             <field name="res_model">res.currency</field>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 4390a9fd50e..0345cfe1b4b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -2,6 +2,16 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
+        <menuitem name="Sales"
+            id="menu_base_partner"
+            groups="base.group_sale_salesman"
+            sequence="6"/>
+
+            <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
+            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 -->
         <record id="view_partner_title_tree" model="ir.ui.view">
             <field name="name">res.partner.title.tree</field>
@@ -36,6 +46,8 @@
             <field name="help">Manage the contact titles you want to have available in your system and the way you want to print them in letters and other documents. Some example: Mr., Mrs. </field>
         </record>
 
+        <menuitem action="action_partner_title_contact" id="menu_partner_title_contact" name="Contact Titles" parent="menu_config_address_book" sequence="3" groups="base.group_no_one"/>
+
         <!-- Partner -->
         <record id="view_partner_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
@@ -448,6 +460,8 @@
             <field name="view_id" ref="view_partner_tree"/>
             <field name="act_window_id" ref="action_partner_form"/>
         </record>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="5"/>
+        <menuitem id="menu_partner_form" parent="base.menu_sales" action="action_partner_form" sequence="3"/>
 
         <record id="action_partner_customer_form" model="ir.actions.act_window">
             <field name="name">Customers</field>
@@ -548,6 +562,7 @@
             </field>
         </record>
 
+        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Contact Tags" sequence="1" parent="menu_config_address_book" groups="base.group_no_one"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index bedb5d9f833..555379e0d74 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -2,6 +2,15 @@
 <openerp>
     <data noupdate="1">
 
+        <record model="ir.ui.menu" id="menu_config_address_book">
+            <field name="name">Contacts</field>
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+        <record model="ir.ui.menu" id="base.menu_sale_config">
+            <field name="name">Configuration</field>
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+
         <!-- Record Rules For Company -->
         <record id="res_company_rule_portal" model="ir.rule">
             <field name="name">company rule portal</field>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index a92d3d58562..3e9b0bed0dd 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -45,6 +45,19 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
+        <record id="group_sale_salesman" model="res.groups">
+            <field name="name">User</field>
+        </record>
+
+        <record id="group_sale_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
+        </record>
+
+        <record id="default_user" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_sale_manager'))]"/>
+        </record>
+
         <record model="res.groups" id="group_partner_manager">
             <field name="name">Contact Creation</field>
         </record>