summaryrefslogtreecommitdiff
path: root/addons/mail/res_users_view.xml
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-05-15 09:32:46 +0200
committerThibault Delavallée <tde@openerp.com>2012-05-15 09:32:46 +0200
commit91d00a198021b86e95a4d034243d64b8528c0bc5 (patch)
tree58a0fd3f3388a0773c1f5510b755a993859b6b14 /addons/mail/res_users_view.xml
parenta6c455e5ab93b8f62da41336e1b5d999c38e39aa (diff)
parentacd27e307a3439de8524172f12518ef37e5c7cca (diff)
[MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7
Diffstat (limited to 'addons/mail/res_users_view.xml')
-rw-r--r--addons/mail/res_users_view.xml14
1 files changed, 8 insertions, 6 deletions
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 93a60e1cdb1..072f2fc3ba5 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,9 +9,9 @@
<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+ <field name="menu_tips" position="after">
<field name="notification_email_pref" readonly="0"/>
- </xpath>
+ </field>
</data>
</field>
</record>
@@ -23,11 +23,13 @@
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
<data>
- <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+ <field name="menu_tips" position="after">
<field name="notification_email_pref"/>
- </xpath>
- <xpath expr="/form/notebook" position="after">
- <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </field>
+ <xpath expr="/form/sheet" position="after">
+ <div class="oe_form_sheet_width">
+ <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</xpath>
</data>
</field>