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/mail/res_users_view.xml | |
| parent | 3afc97f451d8550f18b7b54a08456f7d242888e8 (diff) | |
| parent | c180afab26171617c1c7c22db5d9836b159e5e7d (diff) | |
[MERGE]upstream
bzr revid: dle@openerp.com-20130625162046-snd83ltaha9o5fl8
Diffstat (limited to 'addons/mail/res_users_view.xml')
| -rw-r--r-- | addons/mail/res_users_view.xml | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml index babe922d975..2bf54b4bafd 100644 --- a/addons/mail/res_users_view.xml +++ b/addons/mail/res_users_view.xml @@ -22,21 +22,25 @@ <field name="model">res.users</field> <field name="inherit_id" ref="base.view_users_form"/> <field name="arch" type="xml"> - <data> - <field name="signature" position="before"> - <field name="notification_email_send"/> - </field> - <field name="signature" position="before"> - <field name="alias_domain" invisible="1"/> - <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/> - </field> - <group string="Email preferences" position="after"> - <group name="misc" string="Miscellaneous" - groups="base.group_no_one"> - <field name="display_groups_suggestions"/> - </group> - </group> - </data> + <data> + <field name="signature" position="before"> + <field name="notification_email_send"/> + </field> + <field name="signature" position="before"> + <label for="alias_id" string="Messaging Alias" class="oe_read_only" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <field name="alias_id" class="oe_read_only" required="0" nolabel="1" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <label for="alias_name" string="Messaging Alias" class="oe_edit_only" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}"> + <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> + </div> + <field name="alias_contact" string="Alias Accepts Emails From" + attrs="{'invisible': [('alias_domain', '=', False)]}"/> + <field name="display_groups_suggestions" groups="base.group_no_one"/> + </field> + </data> </field> </record> |