Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] report_py3o: prettier xml after merge with master

pull/479/head
Laurent Mignon (ACSONE) 2020-05-12 17:02:14 +02:00 committed by Alexis de Lattre
parent 36b7e5c897
commit dba79e44f8
5 changed files with 213 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
report_py3o_fusion_server/demo/py3o_pdf_options.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="py3o_pdf_options_pdfa" model="py3o.pdf.options"> <record id="py3o_pdf_options_pdfa" model="py3o.pdf.options">
<field name="name">PDF/A (for Factur-X invoices)</field> <field name="name">PDF/A (for Factur-X invoices)</field>
<field name="pdfa" eval="True" /> <field name="pdfa" eval="True" />
</record> </record>
</odoo> </odoo>

5
report_py3o_fusion_server/views/ir_actions_report.xml
View File

@ -7,7 +7,10 @@
<field name="py3o_multi_in_one" position="after"> <field name="py3o_multi_in_one" position="after">
<field name="py3o_is_local_fusion" /> <field name="py3o_is_local_fusion" />
<field name="py3o_server_id" /> <field name="py3o_server_id" />
<field name="pdf_options_id" attrs="{'invisible': [('py3o_filetype', '!=', 'pdf')]}"/> <field
name="pdf_options_id"
attrs="{'invisible': [('py3o_filetype', '!=', 'pdf')]}"
/>
</field> </field>
</field> </field>
</record> </record>

109
report_py3o_fusion_server/views/py3o_pdf_options.xml
View File

@ -3,10 +3,7 @@
Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<odoo> <odoo>
<record id="py3o_pdf_options_form" model="ir.ui.view"> <record id="py3o_pdf_options_form" model="ir.ui.view">
<field name="name">py3o.pdf.options.form</field> <field name="name">py3o.pdf.options.form</field>
<field name="model">py3o.pdf.options</field> <field name="model">py3o.pdf.options</field>
@ -15,7 +12,10 @@
<div class="oe_title"> <div class="oe_title">
<label for="name" /> <label for="name" />
<h1> <h1>
<field name="name" placeholder="Give a name to the set of PDF export options"/> <field
name="name"
placeholder="Give a name to the set of PDF export options"
/>
</h1> </h1>
</div> </div>
<notebook> <notebook>
@ -24,23 +24,47 @@
<group name="general-left" col="1"> <group name="general-left" col="1">
<group name="general-image" string="Image"> <group name="general-image" string="Image">
<field name="image_compression" widget="radio" /> <field name="image_compression" widget="radio" />
<label for="image_jpeg_quality" attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"/> <label
<div name="image_jpeg_quality" attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"> for="image_jpeg_quality"
<field name="image_jpeg_quality" class="oe_inline"/> attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"
/>
<div
name="image_jpeg_quality"
attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"
>
<field
name="image_jpeg_quality"
class="oe_inline"
/>
</div> </div>
<field name="image_reduce_resolution" /> <field name="image_reduce_resolution" />
</group> </group>
<group name="general-watermark" string="Watermark"> <group name="general-watermark" string="Watermark">
<field name="watermark" /> <field name="watermark" />
<field name="watermark_text" attrs="{'invisible': [('watermark', '!=', True)], 'required': [('watermark', '=', True)]}"/> <field
name="watermark_text"
attrs="{'invisible': [('watermark', '!=', True)], 'required': [('watermark', '=', True)]}"
/>
</group> </group>
</group> </group>
<group name="general-right" string="General"> <group name="general-right" string="General">
<field name="pdfa" /> <field name="pdfa" />
<field name="tagged_pdf" attrs="{'invisible': [('pdfa', '=', True)]}"/> <field
<field name="pdf_form" attrs="{'invisible': [('pdfa', '=', True)]}"/> name="tagged_pdf"
<field name="pdf_form_format" attrs="{'invisible': [('pdf_form', '!=', True)], 'required': [('pdf_form', '=', True)]}"/> attrs="{'invisible': [('pdfa', '=', True)]}"
<field name="pdf_form_allow_duplicate" attrs="{'invisible': [('pdf_form', '!=', True)]}"/> />
<field
name="pdf_form"
attrs="{'invisible': [('pdfa', '=', True)]}"
/>
<field
name="pdf_form_format"
attrs="{'invisible': [('pdf_form', '!=', True)], 'required': [('pdf_form', '=', True)]}"
/>
<field
name="pdf_form_allow_duplicate"
attrs="{'invisible': [('pdf_form', '!=', True)]}"
/>
<field name="export_bookmarks" /> <field name="export_bookmarks" />
<field name="export_placeholders" /> <field name="export_placeholders" />
<field name="export_comments" /> <field name="export_comments" />
@ -57,7 +81,10 @@
</group> </group>
<group name="magnification" string="Magnification"> <group name="magnification" string="Magnification">
<field name="magnification" widget="radio" /> <field name="magnification" widget="radio" />
<field name="zoom" attrs="{'invisible': [('magnification', '!=', '4')]}"/> <field
name="zoom"
attrs="{'invisible': [('magnification', '!=', '4')]}"
/>
</group> </group>
</group> </group>
<group name="initial_view-right"> <group name="initial_view-right">
@ -68,7 +95,10 @@
<page name="user_intf" string="User Interface"> <page name="user_intf" string="User Interface">
<group name="user_intf"> <group name="user_intf">
<group name="user_intf-left" col="1"> <group name="user_intf-left" col="1">
<group name="user_intf-window-options" string="Window Options"> <group
name="user_intf-window-options"
string="Window Options"
>
<field name="resize_windows_initial_page" /> <field name="resize_windows_initial_page" />
<field name="center_window" /> <field name="center_window" />
<field name="open_fullscreen" /> <field name="open_fullscreen" />
@ -76,7 +106,10 @@
</group> </group>
</group> </group>
<group name="user_intf-right" col="1"> <group name="user_intf-right" col="1">
<group name="user_intf-options" string="User Interface Options"> <group
name="user_intf-options"
string="User Interface Options"
>
<field name="hide_menubar" /> <field name="hide_menubar" />
<field name="hide_toolbar" /> <field name="hide_toolbar" />
<field name="hide_window_controls" /> <field name="hide_window_controls" />
@ -101,20 +134,43 @@
</page> </page>
<page string="Security" name="security"> <page string="Security" name="security">
<group name="security"> <group name="security">
<group name="security-left" attrs="{'invisible': [('pdfa', '=', True)]}"> <group
name="security-left"
attrs="{'invisible': [('pdfa', '=', True)]}"
>
<field name="encrypt" /> <field name="encrypt" />
<field name="document_password" password="True" attrs="{'invisible': [('encrypt', '!=', True)], 'required': [('encrypt', '=', True)]}"/> <field
name="document_password"
password="True"
attrs="{'invisible': [('encrypt', '!=', True)], 'required': [('encrypt', '=', True)]}"
/>
<field name="restrict_permissions" /> <field name="restrict_permissions" />
<field name="permission_password" password="True" attrs="{'invisible': [('restrict_permissions', '!=', True)], 'required': [('restrict_permissions', '=', True)]}"/> <field
name="permission_password"
password="True"
attrs="{'invisible': [('restrict_permissions', '!=', True)], 'required': [('restrict_permissions', '=', True)]}"
/>
</group> </group>
<group name="security-right" attrs="{'invisible': ['|', ('pdfa', '=', True), ('restrict_permissions', '=', False)]}"> <group
name="security-right"
attrs="{'invisible': ['|', ('pdfa', '=', True), ('restrict_permissions', '=', False)]}"
>
<field name="printing" widget="radio" /> <field name="printing" widget="radio" />
<field name="changes" widget="radio" /> <field name="changes" widget="radio" />
<field name="content_copying_allowed" /> <field name="content_copying_allowed" />
<field name="text_access_accessibility_tools_allowed" /> <field name="text_access_accessibility_tools_allowed" />
</group> </group>
<group name="security-pdfa" attrs="{'invisible': [('pdfa', '=', False)]}" colspan="2"> <group
<div><p>The security settings are incompatible with the <b>PDF/A-1a</b> option in the <em>General</em> tab.</p></div> name="security-pdfa"
attrs="{'invisible': [('pdfa', '=', False)]}"
colspan="2"
>
<div>
<p
>The security settings are incompatible with the <b
>PDF/A-1a</b> option in the <em
>General</em> tab.</p>
</div>
</group> </group>
</group> </group>
</page> </page>
@ -122,7 +178,6 @@
</form> </form>
</field> </field>
</record> </record>
<record id="py3o_pdf_options_tree" model="ir.ui.view"> <record id="py3o_pdf_options_tree" model="ir.ui.view">
<field name="name">py3o.pdf.options.tree</field> <field name="name">py3o.pdf.options.tree</field>
<field name="model">py3o.pdf.options</field> <field name="model">py3o.pdf.options</field>
@ -132,17 +187,15 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="py3o_pdf_options_action" model="ir.actions.act_window"> <record id="py3o_pdf_options_action" model="ir.actions.act_window">
<field name="name">Py3o PDF Export Options</field> <field name="name">Py3o PDF Export Options</field>
<field name="res_model">py3o.pdf.options</field> <field name="res_model">py3o.pdf.options</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem
<menuitem id="py3o_pdf_options_menu" id="py3o_pdf_options_menu"
parent="report_py3o.py3o_config_menu" parent="report_py3o.py3o_config_menu"
action="py3o_pdf_options_action" action="py3o_pdf_options_action"
sequence="40" /> sequence="40"
/>
</odoo> </odoo>

11
report_py3o_fusion_server/views/py3o_server.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<record id="py3o_server_configuration_form_view" model="ir.ui.view"> <record id="py3o_server_configuration_form_view" model="ir.ui.view">
<field name="name">py3o.server.configuration.form.view</field> <field name="name">py3o.server.configuration.form.view</field>
<field name="model">py3o.server</field> <field name="model">py3o.server</field>
@ -14,7 +13,6 @@
</form> </form>
</field> </field>
</record> </record>
<record id="py3o_server_configuration_tree_view" model="ir.ui.view"> <record id="py3o_server_configuration_tree_view" model="ir.ui.view">
<field name="name">py3o.server.configuration.tree.view</field> <field name="name">py3o.server.configuration.tree.view</field>
<field name="model">py3o.server</field> <field name="model">py3o.server</field>
@ -26,15 +24,14 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="py3o_server_configuration_action" model="ir.actions.act_window"> <record id="py3o_server_configuration_action" model="ir.actions.act_window">
<field name="name">Py3o Servers</field> <field name="name">Py3o Servers</field>
<field name="res_model">py3o.server</field> <field name="res_model">py3o.server</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem
<menuitem id="py3o_server_configuration_menu" id="py3o_server_configuration_menu"
parent="report_py3o.py3o_config_menu" parent="report_py3o.py3o_config_menu"
action="py3o_server_configuration_action" /> action="py3o_server_configuration_action"
/>
</odoo> </odoo>