[FIX] improved visibility rules for inherited mail alias fields

bzr revid: odo@openerp.com-20120806173509-zu57rxzhuksftyqc
This commit is contained in:
Olivier Dony
2012-08-06 19:35:09 +02:00
parent 985263519e
commit 383bdce9c4
4 changed files with 14 additions and 10 deletions
+6 -5
View File
@@ -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>
@@ -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>
+3 -1
View File
@@ -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/>
+3 -2
View File
@@ -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>