[FIX] report_py3o: prettier xml after merge with master

This commit is contained in:
Laurent Mignon (ACSONE)
2020-05-12 17:02:14 +02:00
committed by Elmeri Niemelä
parent 16cf7466b9
commit 28897159f2
6 changed files with 72 additions and 73 deletions

View File

@@ -1,51 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!-- Inherit from base.act_report_xml_view to add py3o-related settings. -->
<record id="py3o_report_view" model="ir.ui.view">
<field name="name">py3o_report_view</field>
<field name="model">ir.actions.report</field>
<field name="inherit_id" ref="base.act_report_xml_view" />
<field name="arch" type="xml">
<xpath expr="/form/field[1]" position="before">
<field name="is_py3o_report_not_available" invisible="1"/>
<div class="alert alert-danger"
role="alert"
style="margin-bottom:0px;"
attrs="{'invisible': [('is_py3o_report_not_available','=',False)]}">
<field name="msg_py3o_report_not_available"/>
</div>
<field name="is_py3o_report_not_available" invisible="1" />
<div
class="alert alert-danger"
role="alert"
style="margin-bottom:0px;"
attrs="{'invisible': [('is_py3o_report_not_available','=',False)]}"
>
<field name="msg_py3o_report_not_available" />
</div>
</xpath>
<xpath expr="//page[@name='security']" position="before">
<page string="LibreOffice Template" name="py3o_tab"
attrs="{'invisible': [('report_type', '!=', 'py3o')]}">
<page
string="LibreOffice Template"
name="py3o_tab"
attrs="{'invisible': [('report_type', '!=', 'py3o')]}"
>
<group name="py3o_params">
<field name="lo_bin_path"/>
<field name="lo_bin_path" />
<field name="py3o_filetype" />
<field name="py3o_multi_in_one"/>
<field name="py3o_multi_in_one" />
<field name="py3o_template_id" />
<field name="module" />
<field name="py3o_template_fallback" />
</group>
</page>
</xpath>
</field>
</record>
<record id="act_report_xml_search_view" model="ir.ui.view">
<field name="name">py3o_report_search_view</field>
<field name="model">ir.actions.report</field>
<field name="inherit_id" ref="base.act_report_xml_search_view"/>
<field name="inherit_id" ref="base.act_report_xml_search_view" />
<field name="arch" type="xml">
<field name="model" position="after">
<filter name="py3o" string="Py3o Reports"
domain="[('report_type', '=', 'py3o')]"/>
<filter
name="py3o"
string="Py3o Reports"
domain="[('report_type', '=', 'py3o')]"
/>
</field>
</field>
</record>
</odoo>

View File

@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<menuitem id="py3o_config_menu"
name="Py3o"
parent="base.reporting_menuitem" />
<menuitem id="py3o_config_menu" name="Py3o" parent="base.reporting_menuitem" />
</odoo>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="py3o_template_configuration_search_view" model="ir.ui.view">
<field name="name">py3o.template.configuration.search.view</field>
<field name="model">py3o.template</field>
@@ -9,13 +8,15 @@
<field name="name" />
<field name="filetype" />
<group string="Group By" name="groupby">
<filter name="filetype_groupby" string="File Type"
context="{'group_by': 'filetype'}"/>
<filter
name="filetype_groupby"
string="File Type"
context="{'group_by': 'filetype'}"
/>
</group>
</search>
</field>
</record>
<record id="py3o_template_configuration_form_view" model="ir.ui.view">
<field name="name">py3o.template.configuration.form.view</field>
<field name="model">py3o.template</field>
@@ -29,7 +30,6 @@
</form>
</field>
</record>
<record id="py3o_template_configuration_tree_view" model="ir.ui.view">
<field name="name">py3o.template.configuration.tree.view</field>
<field name="model">py3o.template</field>
@@ -40,15 +40,14 @@
</tree>
</field>
</record>
<record id="py3o_template_configuration_action" model="ir.actions.act_window">
<field name="name">Py3o Templates</field>
<field name="res_model">py3o.template</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="py3o_template_configuration_menu"
<menuitem
id="py3o_template_configuration_menu"
parent="py3o_config_menu"
action="py3o_template_configuration_action" />
action="py3o_template_configuration_action"
/>
</odoo>

View File

@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="assets_backend" name="report assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/report_py3o/static/src/js/py3oactionmanager.js"></script>
</xpath>
</template>
<template id="assets_backend" name="report assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script
type="text/javascript"
src="/report_py3o/static/src/js/py3oactionmanager.js"
/>
</xpath>
</template>
</odoo>