[MERGE] mail.alias: updated views and simplified models

[odoo/odoo.git] / addons / mail / mail_group_view.xml

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 1db7db1..21b8868 100644 (file)
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -60,13 +60,15 @@
                                 <div class="oe_edit_only">
                                     <label for="name"/> 
                                 </div> 
-                                <h2><field name="name" colspan="4"/></h2>
+                                <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"/>
+                                    </div>
+                                </div>
                                 <newline/>
                                 <group colspan="4" col="4">
                                     <field name="description" colspan="4" nolabel="1"/>
-                                    <div class="oe_edit_only">
-                                        <field name="alias_id" required="0" domain="[('alias_model_id','=','mail.group')]" />
-                                    </div>
                                 </group>
                                 <group colspan="2" col="2" class="oe_edit_only">
                                     <field name="responsible_id" colspan="2"/>