From 383bdce9c4750f80cc0ae1cdffe90d6e0f530945 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 6 Aug 2012 19:35:09 +0200
Subject: [PATCH] [FIX] improved visibility rules for inherited mail alias
 fields

bzr revid: odo@openerp.com-20120806173509-zu57rxzhuksftyqc
---
 addons/crm/crm_view.xml                       | 11 ++++++-----
 addons/hr_recruitment/hr_recruitment_view.xml |  4 ++--
 addons/mail/mail_group_view.xml               |  4 +++-
 addons/project/project_view.xml               |  5 +++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index d7c40266fca..4556b8910ef 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -98,11 +98,12 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
-                            <div name="alias_box" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <label for="alias_name"/>
-                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/>
-                            </div>
-                            <group>
+                           <group>
+                                <field name="alias_id" invisible="1"/>
+                                <label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                                 </div>
                                 <field name="change_responsible"/>
                                 <field name="allow_unlink"/>
                             </group>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 06e9ac93857..cc420b71d25 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -350,9 +350,9 @@
             </field>
             <xpath expr="/form/sheet/h1" version="7.0" position="after">
                 <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                    <field name="id" invisible="1"/>
+                    <field name="alias_id" invisible="1"/>
                     <label for="alias_name" class="oe_edit_only"/>
-                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 0c2a9409544..47106155bfd 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -63,7 +63,9 @@
                                 <div>
                                     <h2><field name="name" colspan="4"/></h2>
                                     <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}" class="oe_edit_only">
-                                        <field name="alias_name" nolabel="1" class="oe_inline"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+                                        <field name="alias_id" invisible="1"/>
+                                        <label for="alias_name" class="oe_edit_only"/>
+                                        <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
                                     </div>
                                 </div>
                                 <newline/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 09a6bf20631..b88aa0a031d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -82,8 +82,9 @@
                         <field name="name" string="Project Name"/>
                     </h1>
                     <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="id" invisible="1"/>
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                        <field name="alias_id" invisible="1"/>
+                        <label for="alias_name" class="oe_edit_only "/>
+                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
                     </div>
                     <group>
                         <group>