odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Simon Lejeune 2014-04-23 15:29:27 +02:00
parent d65b9c5e4c
commit 85c32739d9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/report_webkit/company_view.xml
View File

@ -5,14 +5,12 @@
<field name="model">res.company</field> <field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/> <field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <xpath expr="//page[@string='Report Configuration']/group[@string='Configuration']" position="after">
<page string="Webkit"> <group string="Configuration (Webkit)" col="2">
<separator string="Images" colspan="4"/> <field name="header_image"/>
<field name="header_image" colspan="4" nolabel="1"/> <field name="header_webkit"/>
<separator string="Headers" colspan="4"/> </group>
<field name="header_webkit" colspan="4" nolabel="1"/> </xpath>
</page>
</notebook>
</field> </field>
</record> </record>
</data> </data>

2
addons/report_webkit/header_view.xml
View File

@ -48,7 +48,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </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"/> <menuitem action="action_header_img" id="menu_header_img" parent="menu_webkit" sequence="14"/>
<record id="action_header_webkit" model="ir.actions.act_window"> <record id="action_header_webkit" model="ir.actions.act_window">