summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorRichard Mathot <rim@odoo.com>2016-07-29 11:47:55 +0200
committerRichard Mathot <rim@odoo.com>2016-07-29 14:59:30 +0200
commit4b3ce99b260f4d741a5dfa7c44b241080a0ca4bc (patch)
tree99834ec657176841f67c91cab7ccd55d96841c89 /addons
parentb15f001dfbc28946f2cef8fa4e773a5051128d2c (diff)
[IMP] base,report,report_webkit: clean config view for Reports
Diffstat (limited to 'addons')
-rw-r--r--addons/report/views/ir_actions_report_views.xml12
-rw-r--r--addons/report_webkit/ir_report_view.xml4
2 files changed, 6 insertions, 10 deletions
diff --git a/addons/report/views/ir_actions_report_views.xml b/addons/report/views/ir_actions_report_views.xml
index c5d483d92fd..d0202203b76 100644
--- a/addons/report/views/ir_actions_report_views.xml
+++ b/addons/report/views/ir_actions_report_views.xml
@@ -21,15 +21,11 @@
<field name="model">ir.actions.report.xml</field>
<field name="arch" type="xml">
<data>
- <xpath expr="//field[@name='attachment']" position="after">
+ <xpath expr="//field[@name='report_type']" position="after">
<field name="paperformat_id" attrs="{'invisible':[('report_type','not in',['qweb-pdf'])]}"/>
- <button
- type="object"
- class="oe_link"
- string="Search associated QWeb views"
- name="associated_view"
- attrs="{'invisible':[('report_type', 'not in', ['qweb-pdf', 'qweb-html'])]}"
- />
+ </xpath>
+ <xpath expr="//div[@class='oe_button_box']" position="inside">
+ <button type="object" class="oe_stat_button" string="QWeb views" name="associated_view" attrs="{'invisible':[('report_type', 'not in', ['qweb-pdf', 'qweb-html'])]}" icon='fa-code' />
</xpath>
</data>
</field>
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index b8efd3d9b8a..406367afc7e 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -5,8 +5,8 @@
<field name="model">ir.actions.report.xml</field>
<field name="inherit_id" ref="base.act_report_xml_view"/>
<field name="arch" type="xml">
- <xpath expr="//page[@name='security']" position="before" >
- <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
+ <xpath expr="//page[@name='security']" position="after" >
+ <page string="Webkit" name='webkit' attrs="{'invisible':[('report_type','!=','webkit')]}">
<group>
<field name="webkit_header"/>
<field name="webkit_debug"/>