[IMP]:email_template:solved inheritance problem

bzr revid: apa@tinyerp.com-20120605073234-xtdjpdfwlcxpqk5v

diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 2126944..96b6dcc 100644 (file)
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='active']" position="after">
+                <xpath expr="//field[@name='active']" position="after">
                     <field name="opt_out"/>
                 </xpath>
             </field>

diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index eb97b72..0623c91 100644 (file)
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='History']" position="attributes">
+                <xpath expr="//page[@string='History']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
@@ -23,7 +23,7 @@
                 <page string="History" position="inside">
                     <field name="emails" colspan="4" nolabel="1"/>
                 </page>
-                <xpath expr="/form/notebook" position="after">
+                <xpath expr="/form/sheet/notebook" position="after">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
                             options='{"thread_level": 1}'/>
                 </xpath>