diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 54dbcce0c76..c5a76f0ca1e 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -84,7 +84,7 @@
                 <group expand="1" string="Group By">
                     <filter string="Partner" name="partner_id" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesperson" name='user' context="{'group_by':'user_id'}"/>
-                    <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}"/>
                     <filter string="Product Category" name="category_product" context="{'group_by':'categ_id','residual_invisible':True}"/>
                     <filter string="Status" context="{'group_by':'state'}"/>
                     <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e7b19415a49..be18b00a75c 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -12,16 +12,7 @@
 
         <record model="crm.team" id="sales_team.crm_team_1">
             <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
             <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
         </record>
-
-        <record model="crm.team" id="sales_team.crm_team_2">
-            <field name="name">Marketing</field>
-            <field name="code">SPD</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
-        </record>
-
-  
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 45848d5fffc..5f3caf239b8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -295,7 +295,7 @@ class crm_lead(format_address, osv.osv):
         """ When changing the user, also set a team_id or restrict team id
             to the ones user_id is member of. """
         team_id = self.pool['crm.team']._get_default_team_id(cr, uid, user_id=user_id, context=context)
-        if user_id and not team_id and self.pool['res.users'].has_group(cr, uid, 'base.group_multi_salesteams'):
+        if user_id and not team_id:
             team_ids = self.pool.get('crm.team').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
             if team_ids:
                 team_id = team_ids[0]
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 3904637a905..9afea7ed844 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -106,7 +106,7 @@ Could you please send me the details ?</field>
             <field name="city">Drury</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="priority">2</field>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
             <field name="campaign_id" ref="utm.utm_campaign_email_campaign_products"/>
@@ -160,7 +160,7 @@ Contact: +1 813 494 5005</field>
             <field name="city">Roma</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="priority">2</field>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="campaign_id" ref="utm.utm_campaign_email_campaign_products"/>
@@ -180,7 +180,7 @@ Contact: +1 813 494 5005</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor4])]"/>
 
             <field name="priority">0</field>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="campaign_id" ref="utm.utm_campaign_email_campaign_products"/>
@@ -239,7 +239,7 @@ Contact: +1 813 494 5005</field>
             <field name="city">Sevilla</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="priority">2</field>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -521,7 +521,7 @@ Andrew</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="priority">2</field>
             <field name="next_activity_id" ref="crm_activity_data_meeting"/>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -541,7 +541,7 @@ Andrew</field>
             <field name="tag_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="priority">1</field>
             <field name="next_activity_id" ref="crm_activity_data_email"/>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="campaign_id" ref="utm.utm_campaign_email_campaign_services"/>
@@ -630,7 +630,7 @@ Andrew</field>
             <field name="next_activity_id" ref="crm_activity_data_email"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <!-- <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/> -->
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5ba5b7412ac..43c311feadc 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -47,7 +47,7 @@
                 <form string="Sales Tags">
                     <group>
                         <field name="name"/>
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                     </group>
                 </form>
             </field>
@@ -59,7 +59,7 @@
             <field name="arch" type="xml">
                 <tree string="Sales Tags">
                     <field name="name"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                 </tree>
             </field>
         </record>
@@ -149,8 +149,8 @@
                         <group>
                             <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'] }"/>
-                            <label for="team_id" groups="base.group_multi_salesteams"/>
-                            <div class="o_row" groups="base.group_multi_salesteams">
+                            <label for="team_id"/>
+                            <div class="o_row">
                                 <field name="team_id"/>
                             </div>
                             <field name="type" invisible="1"/>
@@ -239,7 +239,7 @@
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="probability" invisible="1"/>
                     <field name="campaign_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
@@ -331,7 +331,7 @@
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|','|',('partner_name','ilike',self),('email_from','ilike',self),('contact_name','ilike',self),('name','ilike',self)]"/>
                     <field name="tag_ids" string="Tag" filter_domain="[('tag_ids', 'ilike', self)]"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" operator="child_of" string="Customer"/>
                     <field name="create_date"/>
@@ -354,7 +354,7 @@
                             help="Leads that did not ask not to be included in mass mailing campaigns"/>
                     <group expand="0" string="Group By">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter name="customer" string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Campaign"  domain="[]" context="{'group_by':'campaign_id'}"/>
@@ -455,8 +455,8 @@
 
                             <group>
                                 <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']}"/>
-                                <label for="team_id" groups="base.group_multi_salesteams"/>
-                                <div groups="base.group_multi_salesteams" class="o_row">
+                                <label for="team_id"/>
+                                <div class="o_row">
                                     <field name="team_id" widget="selection"/>
                                 </div>
                             </group>
@@ -551,7 +551,7 @@
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" avg="Avg. of Probability"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="user_id"/>
                     <field name="referred" invisible="1"/>
                     <field name="priority" invisible="1"/>
@@ -570,7 +570,7 @@
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="tag_ids" string="Tag" filter_domain="[('tag_ids', 'ilike', self)]"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" operator="child_of" string="Customer"/>
                     <field name="stage_id" domain="[]"/>
@@ -597,7 +597,7 @@
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By" colspan="16">
                         <filter string="Salesperson" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter name="stage" string="Stage" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 8aaa1e7a385..81fb653522d 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -12,7 +12,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="team_id" groups="base.group_multi_salesteams"/>
+                <field name="team_id"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
@@ -34,8 +34,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="user_id"/>
-                    <field name="team_id" widget="selection"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" widget="selection"/>
                     <field name="category2_id" />
                     <field name="stage_id"/>
                     <field name="amount_revenue"/>
@@ -56,8 +55,7 @@
             <graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
                 <field name="amount_revenue" operator="+"/>
-                <field name="team_id" group="True"
-                        groups="base.group_multi_salesteams"/>
+                <field name="team_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -73,7 +71,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="category2_id"/>
                </search>
             </field>
@@ -99,7 +97,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="team_id" groups="base.group_multi_salesteams"/>
+                <field name="team_id"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
                 <field name="nbr"/>
@@ -120,8 +118,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="user_id"/>
-                    <field name="team_id" widget="selection"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" widget="selection"/>
                     <field name="stage_id"/>
                     <field name="amount_revenue"/>
                     <field name="nbr" />
@@ -141,7 +138,7 @@
             <graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
                 <field name="stage_id"/>
                 <field name="amount_revenue" operator="+"/>
-                <field name="team_id" group="True" groups="base.group_multi_salesteams"/>
+                <field name="team_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -157,7 +154,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                </search>
             </field>
         </record>
@@ -182,7 +179,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="team_id" groups="base.group_multi_salesteams"/>
+                <field name="team_id"/>
                 <field name="categ_id"/>
                 <field name="stage_id"/>
                 <field name="nbr"/>
@@ -203,7 +200,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="user_id"/>
-                    <field name="team_id"  widget="selection" groups="base.group_multi_salesteams"/>
+                    <field name="team_id" widget="selection"/>
                     <field name="categ_id"/>
                     <field name="stage_id"/>
                     <field name="nbr" />
@@ -225,7 +222,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                </search>
             </field>
         </record>
@@ -239,7 +236,7 @@
             <graph string="Cases by Team, Category and Stage" type="bar" orientation="horizontal">
                 <field name="categ_id"/>
                 <field name="nbr" operator="+"/>
-                <field name="team_id" group="True" groups="base.group_multi_salesteams"/>
+                <field name="team_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -264,7 +261,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="team_id" groups="base.group_multi_salesteams"/>
+                <field name="team_id"/>
                 <field name="categ_id"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
@@ -286,7 +283,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="user_id"/>
-                    <field name="team_id"  widget="selection" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"  widget="selection"/>
                     <field name="categ_id"/>
                     <field name="category2_id"/>
                     <field name="stage_id"/>
@@ -309,7 +306,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                </search>
             </field>
     </record>
@@ -323,7 +320,7 @@
             <graph string="Cases by Team, Category and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
                 <field name="nbr" operator="+"/>
-                <field name="team_id" group="True" groups="base.group_multi_salesteams"/>
+                <field name="team_id" group="True"/>
             </graph>
         </field>
     </record>
diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_view.xml
index 0f11dd44f37..564d90592b3 100644
--- a/addons/crm/report/crm_activity_report_view.xml
+++ b/addons/crm/report/crm_activity_report_view.xml
@@ -36,12 +36,11 @@
                             domain="['&amp;', ('stage_id.probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
                     <filter string="Lost" name="lost"
                             domain="['&amp;', ('stage_id.probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
-                    <field name="team_id" context="{'invisible_team': False}"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" context="{'invisible_team': False}"/>
                     <field name="author_id" string="Salesperson"/>
                     <group expand="1" string="Group By">
                         <filter string="Salesperson" context="{'group_by':'author_id'}" />
-                        <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 44465b7edbc..ad31ad45043 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -84,8 +84,7 @@
                             domain="['&amp;', ('stage_id.probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
                     <filter string="Lost" name="lost"
                             domain="['&amp;', ('stage_id.probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
-                    <field name="team_id" context="{'invisible_team': False}"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" context="{'invisible_team': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters">
                         <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
@@ -108,7 +107,7 @@
                     </group>
                     <group expand="1" string="Group By">
                         <filter string="Salesperson" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index cca0bf19c43..94cd8c5b605 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -83,8 +83,7 @@
                             domain="['&amp;', ('stage_id.probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
                     <filter string="Lost" name="lost"
                             domain="['&amp;', ('stage_id.probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
-                    <field name="team_id" context="{'invisible_team': False}"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" context="{'invisible_team': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters">
                         <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
@@ -107,7 +106,7 @@
                     </group>
                     <group expand="1" string="Group By">
                         <filter string="Salesperson" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index f0f28301974..f08c8e128ea 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -30,10 +30,8 @@
                             <label for="id" string="Leads Email Alias"/>
                             <div>
                                 <div>
-                                    <span attrs="{'invisible': [('group_multi_salesteams', '!=', True)]}">
-                                        <label string="Each sales team has an email alias that can be defined on the sales team form view" class="oe_inline oe_form_label_help oe_align_right"/>
-                                    </span>
-                                    <span class="oe_inline" attrs="{'invisible': [('group_multi_salesteams', '!=', False)]}">
+                                    <label string="Each sales team has an email alias that can be defined on the sales team form view" class="oe_inline oe_form_label_help oe_align_right"/>
+                                    <span class="oe_inline">
                                         <label string="Automatically create new leads when an email is sent to the following alias :" class="oe_inline oe_form_label_help oe_align_right"/>
                                         <field name="alias_prefix" class="oe_inline"/>
                                         <span>@</span>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 5064b6192ca..cb95eb6e22e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -83,7 +83,7 @@
             <field name="arch" type="xml">
                 <data>
                     <field name="user_id" position="after">
-                        <field name="team_id" completion="1" groups="base.group_multi_salesteams"/>
+                        <field name="team_id" completion="1"/>
                     </field>
                     <div name="button_box" position="inside">
                         <button class="oe_stat_button o_res_partner_tip_opp" type="action"
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index 0d062cf0026..0dc2cdf20c6 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -5,7 +5,7 @@
     uid: 'crm_res_users_salesmanager'
 -
   !python {model: crm.lead}: |
-    team_id = self.pool.get('crm.team').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sales_team.crm_team_2")})
+    team_id = self.pool.get('crm.team').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sales_team.crm_team_1")})
     self.write(cr, uid, [ref("crm_case_1")], {'team_id': team_id})
 -
   Salesman check unqualified lead .
diff --git a/addons/crm/views/crm_action_views.xml b/addons/crm/views/crm_action_views.xml
index e9c6a6f50f3..65d1d4a1d48 100644
--- a/addons/crm/views/crm_action_views.xml
+++ b/addons/crm/views/crm_action_views.xml
@@ -23,7 +23,7 @@
                 </h1>
                 <group>
                   <group>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="description"/>
                     <field name="days"/>
                   </group><group>
@@ -44,7 +44,7 @@
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
                 <field name="days"/>
-                <field name="team_id" groups="base.group_multi_salesteams"/>
+                <field name="team_id"/>
             </tree>
         </field>
     </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index eab8f47d675..a67542a2ce2 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -12,7 +12,7 @@
                     </group>
                     <group string="Assign these opportunities to">
                         <field name="user_id" on_change="on_change_user(user_id, team_id, context)"/>
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                     </group>
                     <group string="Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
                         <field name="opportunity_ids" nolabel="1">
@@ -26,7 +26,7 @@
                                 <field name="phone"/>
                                 <field name="stage_id"/>
                                 <field name="user_id"/>
-                                <field name="team_id" groups="base.group_multi_salesteams"/>
+                                <field name="team_id"/>
                             </tree>
                         </field>
                     </group>
@@ -55,7 +55,7 @@
                         <field name="deduplicate" class="oe_inline" on_change="on_change_deduplicate(deduplicate, context)"/>
                     </group>
                     <group string="Assign opportunities to">
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                         <field name="user_ids" widget="many2many_tags"/>
                         <!-- Uncomment me in trunk -->
                         <!-- <field name="force_assignation" /> -->
@@ -73,7 +73,7 @@
                                 <field name="phone"/>
                                 <field name="stage_id"/>
                                 <field name="user_id"/>
-                                <field name="team_id" groups="base.group_multi_salesteams"/>
+                                <field name="team_id"/>
                             </tree>
                         </field>
                     </group>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index cc6a71ca416..0cccc207372 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,7 +10,7 @@
                 <form string="Merge Leads/Opportunities">
                     <group string="Assign opportunities to">
                         <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, team_id, context)"/>
-                        <field name="team_id" class="oe_inline" groups="base.group_multi_salesteams"/>
+                        <field name="team_id" class="oe_inline"/>
                     </group>
                     <group string="Select Leads/Opportunities">
                         <field name="opportunity_ids" nolabel="1">
@@ -23,7 +23,7 @@
                                 <field name="phone"/>
                                 <field name="stage_id"/>
                                 <field name="user_id"/>
-                                <field name="team_id" groups="base.group_multi_salesteams"/>
+                                <field name="team_id"/>
                             </tree>
                         </field>
                     </group>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b1d377af14b..677023b5103 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -15,7 +15,7 @@
                 <form string="Claim Categories">
                     <group>
                         <field name="name"/>
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                     </group>
                 </form>
             </field>
@@ -27,7 +27,7 @@
             <field name="arch" type="xml">
                 <tree string="Claim Categories">
                     <field name="name"/>
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                 </tree>
             </field>
         </record>
@@ -131,7 +131,7 @@
                     <group colspan="4" col="4"  groups="base.group_user">
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
                         <field name="priority" widget="priority"/>
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                         <field name="date_deadline"/>
                     </group>
                     <group colspan="4" col="4">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 9a1873fab59..8204b716984 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -45,14 +45,13 @@
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <filter string="My Sales Team(s)" context="{'invisible_team': False}" domain="[('team_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
+                    <filter string="My Sales Team(s)" context="{'invisible_team': False}" domain="[('team_id.user_id','=',uid)]" help="My Sales Team(s)"/>
                     <separator/>
                     <filter string="My Company" domain="[('company_id.user_ids','=',uid)]" help="My Company" groups="base.group_multi_company"/>
                     <separator/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="user_id" string="Salesperson"/>
-                    <field name="team_id" string="Sales Team" context="{'invisible_team': False}"
-                            groups="base.group_multi_salesteams"/>
+                    <field name="team_id" string="Sales Team" context="{'invisible_team': False}"/>
                     <group  expand="0" string="Extended Filters...">
                         <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('team_ids', '=', 'team_id')]"/>
diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml
index 6264f8ebb3f..1941168bc2f 100644
--- a/addons/crm_partner_assign/crm_lead_demo.xml
+++ b/addons/crm_partner_assign/crm_lead_demo.xml
@@ -14,7 +14,7 @@
                   <field name="city">Edinburgh</field>
                   <field name="tag_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
                   <field name="priority">2</field>
-                  <field name="team_id" ref="sales_team.crm_team_2"/>
+                  <field name="team_id" ref="sales_team.crm_team_1"/>
                   <field name="user_id" ref=""/>
                   <field name="stage_id" ref="crm.stage_lead1"/>
                   <field name="description">Hi,
diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index c5b13946a97..362b2023752 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -18,7 +18,7 @@
               <field name="campaign_id" invisible="1"/>
               <field name="referred" invisible="1"/>
               <field name="medium_id" invisible="1"/>
-              <field name="team_id" invisible="context.get('invisible_team', True)" groups="base.group_multi_salesteams"/>
+              <field name="team_id" invisible="context.get('invisible_team', True)"/>
 
               <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
               <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
@@ -84,7 +84,7 @@
                    <field name="campaign_id" invisible="1"/>
                    <field name="planned_revenue" sum="Expected Revenues"/>
                    <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                   <field name="team_id" groups="base.group_multi_salesteams" invisible="context.get('invisible_team', True)" />
+                   <field name="team_id" invisible="context.get('invisible_team', True)" />
                    <field name="priority" invisible="1"/>
                </tree>
             </field>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index ab272ae4bda..cccb7694a5b 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -8,7 +8,7 @@
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <field name="team_id" context="{'invisible_team': False}" groups="base.group_multi_salesteams"/>
+                    <field name="team_id" context="{'invisible_team': False}"/>
                     <field name="grade_id"/>
                     <field name="user_id"/>
                     <field name="partner_assigned_id"/>
@@ -24,8 +24,7 @@
                     <group  expand="1" string="Group By">
                         <filter string="Salesperson" name="user"
                             context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" context="{'group_by':'team_id'}"
-                                groups="base.group_multi_salesteams"/>
+                        <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                         <filter string="Country" context="{'group_by':'country_id'}" />
                         <filter string="Stage" context="{'group_by':'stage_id'}"/>
                         <filter string="Company" context="{'group_by':'company_id'}" />
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index f66f54b95b3..25616f85772 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -8,7 +8,7 @@
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
                 <search string="Partner assigned Analysis">
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                     <field name="user_id"/>
                     <field name="grade_id"/>
                     <field name="activation"/>
@@ -16,7 +16,7 @@
                         <filter string="Salesperson" name="user"
                             context="{'group_by':'user_id'}" />
                         <filter string="Sales Team"
-                            context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                            context="{'group_by':'team_id'}"/>
                         <filter string="Partner" name=""
                             context="{'group_by':'partner_id'}" />
                         <separator/>
diff --git a/addons/sale/report/invoice_report_view.xml b/addons/sale/report/invoice_report_view.xml
index 73d50ea98da..b7f23205a5d 100644
--- a/addons/sale/report/invoice_report_view.xml
+++ b/addons/sale/report/invoice_report_view.xml
@@ -8,7 +8,7 @@
 			<field name="arch" type="xml">
 				<filter name="user" position="after">
 					<filter string="Sales Team" domain="[]"
-						context="{'group_by':'section_id'}" groups="base.group_multi_salesteams" />
+						context="{'group_by':'section_id'}"/>
 				</filter>
 			</field>
 		</record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 47a89a43bea..f05b25e1f3f 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -72,7 +72,7 @@
                 </group>
                 <group expand="1" string="Group By">
                     <filter string="Salesperson" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Sales Team" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                    <filter string="Sales Team" context="{'group_by':'team_id'}"/>
                     <filter string="Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
                     <filter string="Customer" name="Customer" context="{'group_by':'partner_id'}"/>
                     <filter string="Product Category" name="Category" context="{'group_by':'categ_id'}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 27b4012a03c..6b7a01ef3f1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -295,7 +295,7 @@
                             <group>
                                 <group string="Sales Information" name="sales_person" groups="base.group_user">
                                     <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'base.group_sale_salesman_all_leads']}"/>
-                                    <field name="team_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
+                                    <field name="team_id" options="{'no_create': True}"/>
                                     <field name="client_order_ref"/>
                                     <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                                 </group>
@@ -341,7 +341,7 @@
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id" operator="child_of"/>
                     <field name="user_id"/>
-                    <field name="team_id" string="Sales Team" groups="base.group_multi_salesteams"/>
+                    <field name="team_id" string="Sales Team"/>
                     <field name="project_id"/>
                     <field name="product_id"/>
                     <filter string="My" domain="[('user_id','=',uid)]" name="my_sale_orders_filter"/>
@@ -638,10 +638,10 @@
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                    <field name="team_id"/>
                 </xpath>
                 <xpath expr="//group/filter[@name='status']" position="after">
-                    <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}" groups="base.group_multi_salesteams"/>
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'team_id'}"/>
                 </xpath>
             </field>
         </record>
@@ -654,7 +654,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                        <field name="team_id"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/sales_team/__init__.py b/addons/sales_team/__init__.py
index 4aa948084fe..c52859910fe 100644
--- a/addons/sales_team/__init__.py
+++ b/addons/sales_team/__init__.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import sales_team
-import res_config
diff --git a/addons/sales_team/__openerp__.py b/addons/sales_team/__openerp__.py
index 077ac32982f..ef97971f685 100644
--- a/addons/sales_team/__openerp__.py
+++ b/addons/sales_team/__openerp__.py
@@ -14,7 +14,6 @@ Using this application you can manage Sales Team  with CRM and/or Sales
     'depends': ['base','mail'],
     'data': ['security/sales_team_security.xml',
              'security/ir.model.access.csv',
-             'res_config_view.xml',
              'sales_team_data.xml',
              'sales_team.xml',
              'sales_team_dashboard.xml',
diff --git a/addons/sales_team/res_config.py b/addons/sales_team/res_config.py
deleted file mode 100644
index 4517945b267..00000000000
--- a/addons/sales_team/res_config.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.osv import fields, osv
-
-
-class sales_team_configuration(osv.TransientModel):
-    _name = 'sale.config.settings'
-    _inherit = ['sale.config.settings']
-
-    _columns = {
-        'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
-            implied_group='base.group_multi_salesteams',
-            help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
-    }
diff --git a/addons/sales_team/res_config_view.xml b/addons/sales_team/res_config_view.xml
deleted file mode 100644
index 859fdf87e63..00000000000
--- a/addons/sales_team/res_config_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <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="base_setup.view_sale_config_settings"/>
-            <field name="arch" type="xml">
-                <data>
-	            <div name="config_sale" position="after">
-                    <separator string="Sales Teams"/>
-                    <group>
-                        <label for="id" string="Manage Sales Teams"/>
-                        <div>
-                            <div>
-                                <field name="group_multi_salesteams" class="oe_inline"/>
-                                <label for="group_multi_salesteams"/>
-                            </div>
-                        </div>
-                    </group>
-	            </div>
-                </data>
-            </field>
-        </record>
-        <menuitem id="base.menu_sale_config" name="Configuration" parent="base.menu_base_partner"
-            sequence="100" action="base_setup.action_sale_config" groups="base.group_configuration"/>
-    </data>
-</openerp>
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 35b5a7c8413..e19a34c362b 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -138,7 +138,7 @@
             </field>
         </record>
 
-        <menuitem id="sales_team.menu_sales_team_act" action="crm_team_salesteams_act" sequence="1" parent="base.menu_base_partner" groups="base.group_multi_salesteams" 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">
diff --git a/addons/sales_team/sales_team_data.xml b/addons/sales_team/sales_team_data.xml
index 4e17374f12a..f9a48772402 100644
--- a/addons/sales_team/sales_team_data.xml
+++ b/addons/sales_team/sales_team_data.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record model="crm.team" id="team_sales_department">
             <field name="name">Direct Sales</field>
-            <field name="code">DM</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
diff --git a/addons/sales_team/sales_team_demo.xml b/addons/sales_team/sales_team_demo.xml
index 9c2d28b61ff..68cc2e0f7a0 100644
--- a/addons/sales_team/sales_team_demo.xml
+++ b/addons/sales_team/sales_team_demo.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="base.group_user" model="res.groups">
-            <field name="implied_ids" eval="[(4, ref('base.group_multi_salesteams'))]"/>
-        </record>
-
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
@@ -14,13 +10,6 @@
         </record>
         <record model="crm.team" id="crm_team_1">
             <field name="name">Indirect Sales</field>
-            <field name="code">IM</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
-        </record>
-
-        <record model="crm.team" id="crm_team_2">
-            <field name="name">Marketing</field>
-            <field name="code">SPD</field>
             <field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
         </record>
     </data>
diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml
index 5cf3db05eac..9763706edbc 100644
--- a/addons/sales_team/security/sales_team_security.xml
+++ b/addons/sales_team/security/sales_team_security.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-        <record id="base.group_multi_salesteams" model="res.groups">
-            <field name="name">Manage Sales Teams</field>
-            <field name="category_id" ref="base.module_category_hidden"/>
-        </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"/>
diff --git a/addons/website_crm_score/demo/website_crm_score_demo.xml b/addons/website_crm_score/demo/website_crm_score_demo.xml
index 8ca0fc5dfa9..86e76fb2edd 100644
--- a/addons/website_crm_score/demo/website_crm_score_demo.xml
+++ b/addons/website_crm_score/demo/website_crm_score_demo.xml
@@ -121,7 +121,7 @@
         <!-- Team 4 -->
         <record id="website_crm_score_team_user_7" model="team.user">
             <field name="user_id" ref="website_crm_score_user_2"/>
-            <field name="team_id" ref="sales_team.crm_team_2"/>
+            <field name="team_id" ref="sales_team.crm_team_1"/>
             <field name="maximum_user_leads">3</field>
             <field name="team_user_domain">[['country_id', '=', 'France']]</field>
         </record>
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
index e0a4addc428..2abc25f925c 100644
--- a/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@ -22,11 +22,5 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
-
-    <!-- multi salesteam mode -->
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_multi_salesteams'))]"/>
-    </record>
-
 </data>
 </openerp>