diff options
| author | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
|---|---|---|
| committer | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
| commit | 75ddd5ccbec73c4a671b6a74efaa3d41dc2ea2db (patch) | |
| tree | 50ed3620df15e8533760f5d47e754a1d39c1e856 /addons/mail/res_users_view.xml | |
| parent | 42f27a15275effd9c43dfe99e32c395ca6b3fd8a (diff) | |
| parent | a7f4b6aaa0359d12046e81183417c24f093cd7c3 (diff) | |
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
Diffstat (limited to 'addons/mail/res_users_view.xml')
| -rw-r--r-- | addons/mail/res_users_view.xml | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml index 1cacadfc898..2bf54b4bafd 100644 --- a/addons/mail/res_users_view.xml +++ b/addons/mail/res_users_view.xml @@ -22,15 +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> - </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> |