summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-08-18 18:49:32 +0200
committerAntony Lesuisse <al@openerp.com>2012-08-18 18:49:32 +0200
commit297cff0449ddb7b7bdcbbe2bd7c8b80c5cb00a35 (patch)
treebc87a329ecff353cf2aad001e984a9e20a924911 /addons/mail
parent6cce0bd9fc7d54602c551213429e151b53963397 (diff)
parent4f76c4e8d9fecca6ffc091f13c40ac3eadcc742d (diff)
[MERGE] auth_config
bzr revid: al@openerp.com-20120818164932-tt7mpm1p5k3i5unu
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/res_config_view.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index c4bc23c9357..d3797ba2dcc 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,9 +6,10 @@
<field name="model">base.config.settings</field>
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="arch" type="xml">
- <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
+ <xpath expr="//div[@name='email']" position='inside'>
<div>
- <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
+ <label for="alias_domain" class="oe_inline"/>
+ <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
</div>
</xpath>
</field>