pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] base,report,report_webkit: clean config view for Reports

Browse Source
This commit is contained in:
Richard Mathot
2016-07-29 14:59:30 +02:00
parent b15f001dfb
commit 4b3ce99b26
3 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report/views/ir_actions_report_views.xml
+4 -8
View File
@@ -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>
addons/report_webkit/ir_report_view.xml
+2 -2
View File
@@ -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"/>
openerp/addons/base/ir/ir_actions.xml
+45 -38
View File
@@ -54,47 +54,54 @@
<field name="arch" type="xml">
<form string="Report">
<field name="ir_values_id" invisible="1"/>
<button name="create_action" string="Add in the 'Print' menu" type="object"
attrs="{'invisible':[('ir_values_id','!=',False)]}"
help="Display an option on related documents to print this report"/>
<button name="unlink_action" string="Remove from the 'Print' menu" type="object"
attrs="{'invisible':[('ir_values_id','=',False)]}"
help="Remove the contextual action related this report"/>
<group>
<sheet>
<div class="oe_button_box" name="button_box">
<button name="create_action" string="Add in the 'Print' menu" type="object"
attrs="{'invisible':[('ir_values_id','!=',False)]}" icon="fa-plus-square"
help="Display an option on related documents to print this report" class="oe_stat_button"/>
<button name="unlink_action" string="Remove from the 'Print' menu" type="object"
attrs="{'invisible':[('ir_values_id','=',False)]}" icon="fa-minus-square"
help="Remove the contextual action related this report" class="oe_stat_button"/>
</div>
<group>
<field name="name"/>
<field name="model"/>
<field name="report_type"/>
<field name="report_name" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
<field name="report_rml" attrs="{'invisible':[('report_type','!=', 'controller')]}"/>
</group>
<group>
<field name="multi"/>
<field name="attachment_use" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
<field name="attachment" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
</group>
</group>
<notebook>
<page name="security" string="Security">
<field name="groups_id"/>
</page>
<page string="RML Configuration" attrs="{'invisible':[('report_type','not in',['pdf','sxw'])]}">
<group>
<group string="RML Report">
<field name="header"/>
<field name="report_file"/>
<field name="auto"/>
<field name="parser"/>
<field name="usage"/>
</group>
<group string="XML Report">
<field name="report_xsl"/>
<field name="report_xml"/>
</group>
<field name="name"/>
<field name="report_type"/>
</group>
</page>
</notebook>
<group>
<field name="model"/>
<field name="report_name" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
<field name="report_rml" attrs="{'invisible':[('report_type','!=', 'controller')]}"/>
</group>
</group>
<notebook>
<page name="security" string="Security">
<field name="groups_id"/>
</page>
<page name='rml' string="RML Configuration" attrs="{'invisible':[('report_type','not in',['pdf','sxw'])]}">
<group>
<group string="RML Report">
<field name="header"/>
<field name="report_file"/>
<field name="auto"/>
<field name="parser"/>
<field name="usage"/>
</group>
<group string="XML Report">
<field name="report_xsl"/>
<field name="report_xml"/>
</group>
</group>
</page>
<page name='advanced' string="Advanced Properties">
<group>
<field name="multi"/>
<field name="attachment_use" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
<field name="attachment" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>