From bc90e644a9f3d2636992ad2265e76838eaeb702c Mon Sep 17 00:00:00 2001
From: "Ravish (Open ERP)" <rmu@tinyerp.com>
Date: Fri, 4 Apr 2014 17:18:07 +0530
Subject: [PATCH] [IMP]done the require changes

---
 addons/crm/crm_case_section_view.xml | 23 ++++++++++++++++++++++-
 addons/sale_team/sale_team.py        |  1 -
 addons/sale_team/sale_team.xml       | 19 -------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index a56459a7065..caa282c4e7f 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -89,10 +89,14 @@
             <data>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="use_leads"/>
+                    <field name="alias_id"/>
                     <field name="monthly_open_leads"/>
                     <field name="monthly_planned_revenue"/>
                 </xpath>
                 <xpath expr="//div[@class='oe_clear']" position="before">
+                <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                    <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                </div>
                 <div class="oe_items_list">
                     <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
                         <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
@@ -152,9 +156,26 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
                     <div name="options_active">
-                        <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
+                       <h6><field name="use_leads"/><label for="use_leads" string="Leads"/></h6>
                     </div>
                 </xpath>
+                <xpath expr="//group/field[@name='active']" position="inside">
+                    <group>
+                        <label for="alias_name" string="Email Alias"
+                                attrs="p'invisible': [('alias_domain', '=', False)]}"/>
+                        <div name="alias_def"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <field name="alias_id" class="oe_read_only oe_inline"
+                                    string="Email Alias" required="0"/>
+                            <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            </div>
+                        </div>
+                        <field name="alias_contact" class="oe_inline"
+                                string="Accept Emails From"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    </group>
+                </xpath>
                 <xpath expr="//page[@string='Team Members']" position="after">
                     <page string="Stages">
                         <separator string="Select Stages for this Sales Team"/>
diff --git a/addons/sale_team/sale_team.py b/addons/sale_team/sale_team.py
index fd898bb248c..423bb21391c 100644
--- a/addons/sale_team/sale_team.py
+++ b/addons/sale_team/sale_team.py
@@ -32,7 +32,6 @@ from openerp.osv import osv
 
 class crm_case_section(osv.osv):
     _name = "crm.case.section"
-    _inherits = {'mail.alias': 'alias_id'}
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Teams"
     _order = "complete_name"
diff --git a/addons/sale_team/sale_team.xml b/addons/sale_team/sale_team.xml
index 687919ff66a..0120dbd21b5 100644
--- a/addons/sale_team/sale_team.xml
+++ b/addons/sale_team/sale_team.xml
@@ -41,7 +41,6 @@
                     <field name="user_id"/>
                     <field name="member_ids"/>
                     <field name="note"/>
-                    <field name="alias_id"/>
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -56,9 +55,6 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4 class="oe_center"><field name="name"/></h4>
-                                   <div class="oe_kanban_alias oe_center" t-if="record.alias_id.value">
-                                        <small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
-                                    </div>
                                     <div class="oe_clear"></div>
                                     <div class="oe_kanban_salesteams_avatars">
                                         <t t-foreach="record.member_ids.raw_value.slice(0,10)" t-as="member">
@@ -138,21 +134,6 @@
                                 <field name="change_responsible"/>
                                 <field name="active"/>
                             </group>
-                            <group>
-                                <label for="alias_name" string="Email Alias"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                                <div name="alias_def"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_id" class="oe_read_only oe_inline"
-                                            string="Email Alias" required="0"/>
-                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                                    </div>
-                                </div>
-                                <field name="alias_contact" class="oe_inline"
-                                        string="Accept Emails From"
-                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                            </group>
                         </group>
                         <notebook colspan="4">
                             <page string="Team Members">