diff options
| author | Denis Ledoux <dle@openerp.com> | 2013-06-25 18:20:46 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@openerp.com> | 2013-06-25 18:20:46 +0200 |
| commit | 5ed41bcea4c5b0f4e4afdd45c8a114cf3ca144fc (patch) | |
| tree | f3d256944be2979be18c07282e62dc5bcb8ec10a /addons/crm/crm_case_section_view.xml | |
| parent | 3afc97f451d8550f18b7b54a08456f7d242888e8 (diff) | |
| parent | c180afab26171617c1c7c22db5d9836b159e5e7d (diff) | |
[MERGE]upstream
bzr revid: dle@openerp.com-20130625162046-snd83ltaha9o5fl8
Diffstat (limited to 'addons/crm/crm_case_section_view.xml')
| -rw-r--r-- | addons/crm/crm_case_section_view.xml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml index be5611c03c4..c957311b47f 100644 --- a/addons/crm/crm_case_section_view.xml +++ b/addons/crm/crm_case_section_view.xml @@ -94,7 +94,7 @@ <div class="oe_kanban_content"> <h4 class="oe_center"><field name="name"/></h4> <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value"> - <small><span class="oe_e" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small> + <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"> @@ -168,17 +168,6 @@ <h1> <field name="name" string="Salesteam"/> </h1> - <div name="group_alias" - attrs="{'invisible': [('alias_domain', '=', False)]}"> - <label for="alias_id" string="Email Alias"/> - <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> - <span name="edit_alias" class="oe_edit_only"> - <field name="alias_name" class="oe_inline" - attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/> - @ - <field name="alias_domain" class="oe_inline" readonly="1"/> - </span> - </div> <div name="options_active"> <field name="use_leads" class="oe_inline"/><label for="use_leads"/> </div> @@ -187,12 +176,25 @@ <group> <field name="user_id"/> <field name="code"/> - </group> - <group> <field name="parent_id"/> <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"> |