diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 166cfc7f435..da57ae628b3 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -91,7 +91,6 @@ class crm_case_stage(osv.osv):
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
     _name = "crm.case.section"
-    _inherits = {'mail.alias': 'alias_id'}
     _inherit = 'crm.case.section'
     _description = "Sales Teams"
 
@@ -120,18 +119,17 @@ class crm_case_section(osv.osv):
         return res
 
     _columns = {
-    
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
         'use_leads': fields.boolean('Leads',
             help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
-
+                
         'monthly_open_leads': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
             string='Open Leads per Month'),
         'monthly_planned_revenue': fields.function(_get_opportunities_data,
             type="string", readonly=True, multi='_get_opportunities_data',
-            string='Planned Revenue per Month')
+            string='Planned Revenue per Month'),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
     }
 
     def _get_stage_common(self, cr, uid, context):
@@ -142,15 +140,6 @@ class crm_case_section(osv.osv):
         'stage_ids': _get_stage_common,
         'use_leads': True,
     }
-    
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
-        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
-        section = self.browse(cr, uid, section_id, context=context)
-        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
-        return section_id
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 231a7124824..41f4819e500 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -26,34 +26,30 @@
             <field name="name">Email</field>
         </record>
 
-        <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Direct Sales</field>
-            <field name="code">DM</field>
+        <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="use_leads">True</field>
-            <field name="alias_name">sales</field>
-            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
         <!-- Payment Mode -->
 
         <record model="crm.payment.mode" id="payment_mode_1">
             <field name="name">Cash</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_2">
             <field name="name">Check</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_3">
             <field name="name">Credit Card</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_4">
             <field name="name">Demand Draft</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <!--default alias for leads-->
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 82bdcd8fcd9..1541753523a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -6,22 +6,6 @@
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
-        <record id="crm.section_sales_department" model="crm.case.section">
-            <field name="member_ids" eval="[(4, ref('base.user_demo'))]"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_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.case.section" id="crm_case_section_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>
-
         <record model="crm.segmentation" id="crm_segmentation0">
             <field name="name">OpenERP partners</field>
             <field name="exclusif">True</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 32891c21981..e0149269243 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -195,6 +195,7 @@ class crm_lead(format_address, osv.osv):
                             resource_id = resource_ids[0]
 
                     duration = float(ans.days)
+                    
                     if lead.section_id and lead.section_id.resource_calendar_id:
                         duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 1abcdac9712..6dbe9b2ba88 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -60,7 +60,7 @@
             <field name="type">opportunity</field>
         </record>
         
-        <record model="crm.case.section" id="section_sales_department">
+        <record model="crm.case.section" id="sale_team.section_sales_department">
             <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
@@ -70,76 +70,76 @@
         <!-- Crm campain -->
         <record model="crm.case.resource.type" id="type_lead1">
             <field name="name">Telesales</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead2">
             <field name="name">Email Campaign - Services</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead3">
             <field name="name">Email Campaign - Products</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead4">
             <field name="name">Twitter Ads</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead5">
             <field name="name">Google Adwords</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead6">
             <field name="name">Banner Ads</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead7">
             <field name="name">Television</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead8">
             <field name="name">Newsletter</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
         </record>
 
         <!--  crm categories -->
         <record model="crm.case.categ" id="categ_oppor1">
             <field name="name">Product</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor2">
             <field name="name">Software</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor3">
             <field name="name">Services</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor4">
             <field name="name">Information</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor5">
             <field name="name">Design</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor6">
             <field name="name">Training</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor7">
             <field name="name">Consulting</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor8">
             <field name="name">Other</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index dab17888d7a..0187f14555f 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
@@ -55,7 +55,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -84,7 +84,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -105,7 +105,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
         </record>
@@ -130,7 +130,7 @@ Could you please send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -157,7 +157,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -175,7 +175,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">5</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -194,7 +194,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">4</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -213,7 +213,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -231,7 +231,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -254,7 +254,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -272,7 +272,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
         </record>
@@ -310,7 +310,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
         </record>
@@ -335,7 +335,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
         </record>
@@ -356,7 +356,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
@@ -383,7 +383,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-1')" name="date_action"/>
             <field name="title_action">Convert to quote</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -408,7 +408,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -435,7 +435,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
@@ -462,7 +462,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <field name="title_action">Ask for the good receprion of the proposition</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_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=3)).strftime('%Y-%m-%d %H:%M')"/>
@@ -479,7 +479,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor8])]"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
         </record>
@@ -493,7 +493,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <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')"/>
@@ -511,7 +511,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -526,7 +526,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">5</field>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <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')"/>
@@ -545,7 +545,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">5</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
-            <field name="section_id" ref="section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
@@ -568,7 +568,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
-            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
@@ -592,7 +592,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <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_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 0e2bb6511c5..4e613e7f72a 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -6,13 +6,13 @@
     -->
     <record model="crm.case.categ" id="categ_phone1">
         <field name="name">Inbound</field>
-        <field name="section_id" ref="section_sales_department"/>
+        <field name="section_id" ref="sale_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 
     </record>
     <record model="crm.case.categ" id="categ_phone2">
         <field name="name">Outbound</field>
-        <field name="section_id" ref="section_sales_department"/>
+        <field name="section_id" ref="sale_team.section_sales_department"/>
         <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 4002e18815e..c6026c8d894 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -11,7 +11,7 @@
             <field name="name">Left the message</field>
             <field name="state">done</field>
             <field name="partner_phone">+34 934 340 230</field>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="sale_team.section_sales_department"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="name">Need more information on the proposed deal</field>
             <field name="state">done</field>
             <field name="partner_phone">+44 121 690 4596</field>
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="1.5" name="duration"/>
@@ -37,7 +37,7 @@
             <field name="name">Ask for convenient time of meeting</field>
             <field name="state">open</field>
             <field name="partner_phone">+1 786 525 0724</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="5.0" name="duration"/>
@@ -50,7 +50,7 @@
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="5.45" name="duration"/>
@@ -63,7 +63,7 @@
             <field name="name">More information on the proposed deal</field>
             <field name="state">pending</field>
             <field name="partner_phone">+1 312 349 2324</field>
-            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="section_id" ref="sale_team.crm_case_section_1"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="2.08" name="duration"/>
@@ -74,7 +74,7 @@
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>
             <field name="partner_phone">+34 230 953 485</field>
-            <field name="section_id" ref="crm.crm_case_section_2"/>
+            <field name="section_id" ref="sale_team.crm_case_section_2"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
diff --git a/addons/sale_team/__openerp__.py b/addons/sale_team/__openerp__.py
index bb1e8ab5830..9bbdc73e876 100644
--- a/addons/sale_team/__openerp__.py
+++ b/addons/sale_team/__openerp__.py
@@ -22,13 +22,17 @@
     'name' : 'Sale Team',
     'version' : '1.0',
     'author' : 'OpenERP SA',
-    'category': 'hidden',   
+    'category': 'Sales Management',   
     'summary': 'Sales Team',
     'description': """ """,
     'website': 'http://www.openerp.com',
-    'depends' : ['base','web_kanban','mail', 'resource'],
-    'data': ['sale_team.xml','sale_team_security.xml','res_config_view.xml','ir.model.access.csv'],
-    'demo': [],
+    'depends' : ['base','mail'],
+    'data': ['security/sale_team_security.xml',
+             'res_config_view.xml',
+             'ir.model.access.csv',
+             'sale_team_data.xml',
+             'sale_team.xml',],
+    'demo': ['sale_team_demo.xml'],
     'css': ['static/src/css/sale_team.css'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index 423bb21391c..eb6c892c2e9 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -34,6 +34,7 @@ class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
+    _inherits = {'mail.alias': 'alias_id'}
     _order = "complete_name"
     _period_number = 5
 
@@ -71,6 +72,7 @@ class crm_case_section(osv.osv):
         return section_result
    
     _columns = {
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True, help="The email address associated with this team. New emails received will automatically ""create new leads assigned to the team."),
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
@@ -82,7 +84,6 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16, 2)),
         'color': fields.integer('Color Index'),
@@ -115,7 +116,16 @@ class crm_case_section(osv.osv):
                 name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
-        
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name='res.user', alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
+             
 class res_users(osv.Model):
     _inherit = 'res.users'
     _columns = {
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 0120dbd21b5..f2fea79a933 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
+            groups="base.group_sale_salesman,base.group_sale_manager"/>
  <!-- Update user form !-->
         <record model="ir.ui.view" id="res_user_form">
             <field name="name">Users Preferences</field>
diff --git a/addons/sale_team/sale_team_security.xml b/addons/sale_team/sale_team_security.xml
deleted file mode 100644
index ff8eef01678..00000000000
--- a/addons/sale_team/sale_team_security.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-    <record id="base.group_mono_salesteams" model="res.groups">
-        <field name="name">Do Not Use Sales Teams</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
-    </record>
-
-    <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>
-</data>
-</openerp>
-