From 85c32739d911ad24b53e040ea627614736fbe64b Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Wed, 23 Apr 2014 15:29:27 +0200
Subject: [PATCH] [FIX] report_webkit: moved configuration to the report tab of
 company form and moved menuitem under 'Reports' menuitem

bzr revid: sle@openerp.com-20140423132927-3n5xv62zck6nyh2m
---
 addons/report_webkit/company_view.xml | 14 ++++++--------
 addons/report_webkit/header_view.xml  |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml
index 2768ade976b..566cf29e5a8 100644
--- a/addons/report_webkit/company_view.xml
+++ b/addons/report_webkit/company_view.xml
@@ -5,14 +5,12 @@
             <field name="model">res.company</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Webkit">
-                        <separator string="Images" colspan="4"/>
-                        <field name="header_image" colspan="4" nolabel="1"/>
-                        <separator string="Headers" colspan="4"/>
-                        <field name="header_webkit" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
+                <xpath expr="//page[@string='Report Configuration']/group[@string='Configuration']" position="after">
+                    <group string="Configuration (Webkit)" col="2">
+                        <field name="header_image"/>
+                        <field name="header_webkit"/>
+                    </group>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index 833e813ba4e..da47e6f1642 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -48,7 +48,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="menu_webkit" name="Webkit" parent="base.menu_custom"/>
+        <menuitem id="menu_webkit" name="Webkit" parent="report.reporting_menuitem"/>
         <menuitem action="action_header_img" id="menu_header_img" parent="menu_webkit" sequence="14"/>
 
         <record id="action_header_webkit" model="ir.actions.act_window">