From c934ab4a7ae7a55b2fac0eff1f5225142998bdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 29 Mar 2013 11:18:57 +0100
Subject: [PATCH] [IMP] mail_group, hr_job: added aliases always visible in
 form view.

bzr revid: tde@openerp.com-20130329101857-ryp7jtzo475g73kf
---
 addons/hr_recruitment/hr_recruitment_view.xml | 19 +++++++++----------
 addons/mail/mail_group_view.xml               |  8 +++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2ab8c1f4cf4..46559db0a4d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -312,16 +312,15 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="//sheet//group" version="7.0" position="after">
-                <group colspan="4">
-                    <label for="alias_id"/>
-                    <div class="oe_inline" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                        <span class="oe_edit_only" name="edit_alias">
-                            <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
-                        </span>
-                     </div>
-                </group>
+            <xpath expr="//div[@class='oe_title']//h1" position="after">
+                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                    <field name="alias_id" class="oe_inline" required="0" invisible="1"/>
+                    <label for="alias_id" string='Email'
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <span name="edit_alias">
+                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
+                    </span>
+                </div>
             </xpath>
         </field>
     </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d103199d567..31c22f94cb7 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -76,11 +76,9 @@
                             </div>
                             <h1><field name="name" readonly="0"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <field name="alias_id" class="oe_read_only" required="0"/>
-                                <span class="oe_edit_only">
-                                    <label for="alias_name"/>
-                                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
-                                </span>
+                                <field name="alias_id" class="oe_read_only" required="0" invisible="1"/>
+                                <label for="alias_name" string="Email"/>
+                                <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
                             </div>
                         </div>
                         <field name="description" placeholder="Topics discussed in this group..."/>