From dba79e44f858ee6be68ae7cb2fbb548172a43ff4 Mon Sep 17 00:00:00 2001
From: "Laurent Mignon (ACSONE)" <laurent.mignon@acsone.eu>
Date: Tue, 12 May 2020 17:02:14 +0200
Subject: [PATCH] [FIX] report_py3o: prettier xml after merge with master

---
 .../demo/py3o_pdf_options.xml                 |  14 +-
 .../demo/report_py3o.xml                      |   4 +-
 .../views/ir_actions_report.xml               |   9 +-
 .../views/py3o_pdf_options.xml                | 331 ++++++++++--------
 .../views/py3o_server.xml                     |  19 +-
 5 files changed, 213 insertions(+), 164 deletions(-)

diff --git a/report_py3o_fusion_server/demo/py3o_pdf_options.xml b/report_py3o_fusion_server/demo/py3o_pdf_options.xml
index de1fec760..513a9d83d 100644
--- a/report_py3o_fusion_server/demo/py3o_pdf_options.xml
+++ b/report_py3o_fusion_server/demo/py3o_pdf_options.xml
@@ -1,11 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-
-
-<record id="py3o_pdf_options_pdfa" model="py3o.pdf.options">
-    <field name="name">PDF/A (for Factur-X invoices)</field>
-    <field name="pdfa" eval="True"/>
-</record>
-
-
+    <record id="py3o_pdf_options_pdfa" model="py3o.pdf.options">
+        <field name="name">PDF/A (for Factur-X invoices)</field>
+        <field name="pdfa" eval="True" />
+    </record>
 </odoo>
diff --git a/report_py3o_fusion_server/demo/report_py3o.xml b/report_py3o_fusion_server/demo/report_py3o.xml
index ce9de5c4e..1a9f33d32 100644
--- a/report_py3o_fusion_server/demo/report_py3o.xml
+++ b/report_py3o_fusion_server/demo/report_py3o.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="report_py3o.res_users_report_py3o" model="ir.actions.report">
-      <field name="py3o_is_local_fusion" eval="1"/>
+        <field name="py3o_is_local_fusion" eval="1" />
     </record>
 </odoo>
diff --git a/report_py3o_fusion_server/views/ir_actions_report.xml b/report_py3o_fusion_server/views/ir_actions_report.xml
index a013fba3d..e1192425d 100644
--- a/report_py3o_fusion_server/views/ir_actions_report.xml
+++ b/report_py3o_fusion_server/views/ir_actions_report.xml
@@ -1,13 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <record id="view_ir_actions_report_base" model="ir.ui.view">
         <field name="model">ir.actions.report</field>
         <field name="inherit_id" ref="report_py3o.py3o_report_view" />
         <field name="arch" type="xml">
             <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="pdf_options_id" attrs="{'invisible': [('py3o_filetype', '!=', 'pdf')]}"/>
+                <field
+                    name="pdf_options_id"
+                    attrs="{'invisible': [('py3o_filetype', '!=', 'pdf')]}"
+                />
             </field>
         </field>
     </record>
diff --git a/report_py3o_fusion_server/views/py3o_pdf_options.xml b/report_py3o_fusion_server/views/py3o_pdf_options.xml
index dfade7099..4a574838b 100644
--- a/report_py3o_fusion_server/views/py3o_pdf_options.xml
+++ b/report_py3o_fusion_server/views/py3o_pdf_options.xml
@@ -1,148 +1,201 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
   -->
-
 <odoo>
-
-
-<record id="py3o_pdf_options_form" model="ir.ui.view">
-    <field name="name">py3o.pdf.options.form</field>
-    <field name="model">py3o.pdf.options</field>
-    <field name="arch" type="xml">
-        <form string="Py3o PDF Export Options">
-            <div class="oe_title">
-                <label for="name"/>
-                <h1>
-                    <field name="name" placeholder="Give a name to the set of PDF export options"/>
-                </h1>
-            </div>
-            <notebook>
-                <page name="general" string="General">
-                    <group name="general">
-                        <group name="general-left" col="1">
-                            <group name="general-image" string="Image">
-                                <field name="image_compression" widget="radio"/>
-                                <label for="image_jpeg_quality" attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"/>
-                                <div name="image_jpeg_quality" attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}">
-                                    <field name="image_jpeg_quality" class="oe_inline"/>
+    <record id="py3o_pdf_options_form" model="ir.ui.view">
+        <field name="name">py3o.pdf.options.form</field>
+        <field name="model">py3o.pdf.options</field>
+        <field name="arch" type="xml">
+            <form string="Py3o PDF Export Options">
+                <div class="oe_title">
+                    <label for="name" />
+                    <h1>
+                        <field
+                            name="name"
+                            placeholder="Give a name to the set of PDF export options"
+                        />
+                    </h1>
+                </div>
+                <notebook>
+                    <page name="general" string="General">
+                        <group name="general">
+                            <group name="general-left" col="1">
+                                <group name="general-image" string="Image">
+                                    <field name="image_compression" widget="radio" />
+                                    <label
+                                        for="image_jpeg_quality"
+                                        attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"
+                                    />
+                                    <div
+                                        name="image_jpeg_quality"
+                                        attrs="{'invisible': [('image_compression', '!=', 'jpeg')]}"
+                                    >
+                                        <field
+                                            name="image_jpeg_quality"
+                                            class="oe_inline"
+                                        />
+                                    </div>
+                                    <field name="image_reduce_resolution" />
+                                </group>
+                                <group name="general-watermark" string="Watermark">
+                                    <field name="watermark" />
+                                    <field
+                                        name="watermark_text"
+                                        attrs="{'invisible': [('watermark', '!=', True)], 'required': [('watermark', '=', True)]}"
+                                    />
+                                </group>
+                            </group>
+                            <group name="general-right" string="General">
+                                <field name="pdfa" />
+                                <field
+                                    name="tagged_pdf"
+                                    attrs="{'invisible': [('pdfa', '=', 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_placeholders" />
+                                <field name="export_comments" />
+                                <field name="export_hidden_slides" />
+                            </group>
+                        </group>
+                    </page>
+                    <page name="initial_view" string="Initial View">
+                        <group name="initial_view">
+                            <group name="initial_view-left" col="1">
+                                <group name="panes" string="Panes">
+                                    <field name="initial_view" widget="radio" />
+                                    <field name="initial_page" />
+                                </group>
+                                <group name="magnification" string="Magnification">
+                                    <field name="magnification" widget="radio" />
+                                    <field
+                                        name="zoom"
+                                        attrs="{'invisible': [('magnification', '!=', '4')]}"
+                                    />
+                                </group>
+                            </group>
+                            <group name="initial_view-right">
+                                <field name="page_layout" widget="radio" />
+                            </group>
+                        </group>
+                    </page>
+                    <page name="user_intf" string="User Interface">
+                        <group name="user_intf">
+                            <group name="user_intf-left" col="1">
+                                <group
+                                    name="user_intf-window-options"
+                                    string="Window Options"
+                                >
+                                    <field name="resize_windows_initial_page" />
+                                    <field name="center_window" />
+                                    <field name="open_fullscreen" />
+                                    <field name="display_document_title" />
+                                </group>
+                            </group>
+                            <group name="user_intf-right" col="1">
+                                <group
+                                    name="user_intf-options"
+                                    string="User Interface Options"
+                                >
+                                    <field name="hide_menubar" />
+                                    <field name="hide_toolbar" />
+                                    <field name="hide_window_controls" />
+                                </group>
+                                <group string="Bookmarks" name="bookmarks">
+                                    <field name="open_bookmark_levels" />
+                                </group>
+                            </group>
+                        </group>
+                    </page>
+                    <page string="Links" name="links">
+                        <group name="links" col="1">
+                            <group name="links-general" string="General">
+                                <field name="export_bookmarks_named_dest" />
+                                <field name="convert_doc_ref_to_pdf_target" />
+                                <field name="export_filesystem_urls" />
+                            </group>
+                            <group name="links-cross-doc" string="Cross-document Links">
+                                <field name="cross_doc_link_action" widget="radio" />
+                            </group>
+                        </group>
+                    </page>
+                    <page string="Security" name="security">
+                        <group name="security">
+                            <group
+                                name="security-left"
+                                attrs="{'invisible': [('pdfa', '=', True)]}"
+                            >
+                                <field name="encrypt" />
+                                <field
+                                    name="document_password"
+                                    password="True"
+                                    attrs="{'invisible': [('encrypt', '!=', True)], 'required': [('encrypt', '=', True)]}"
+                                />
+                                <field name="restrict_permissions" />
+                                <field
+                                    name="permission_password"
+                                    password="True"
+                                    attrs="{'invisible': [('restrict_permissions', '!=', True)], 'required': [('restrict_permissions', '=', True)]}"
+                                />
+                            </group>
+                            <group
+                                name="security-right"
+                                attrs="{'invisible': ['|', ('pdfa', '=', True), ('restrict_permissions', '=', False)]}"
+                            >
+                                <field name="printing" widget="radio" />
+                                <field name="changes" widget="radio" />
+                                <field name="content_copying_allowed" />
+                                <field name="text_access_accessibility_tools_allowed" />
+                            </group>
+                            <group
+                                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>
-                                <field name="image_reduce_resolution"/>
-                            </group>
-                            <group name="general-watermark" string="Watermark">
-                                <field name="watermark"/>
-                                <field name="watermark_text" attrs="{'invisible': [('watermark', '!=', True)], 'required': [('watermark', '=', True)]}"/>
                             </group>
                         </group>
-                        <group name="general-right" string="General">
-                            <field name="pdfa"/>
-                            <field name="tagged_pdf" attrs="{'invisible': [('pdfa', '=', 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_placeholders"/>
-                            <field name="export_comments"/>
-                            <field name="export_hidden_slides"/>
-                        </group>
-                    </group>
-                </page>
-                <page name="initial_view" string="Initial View">
-                    <group name="initial_view">
-                        <group name="initial_view-left" col="1">
-                            <group name="panes" string="Panes">
-                                <field name="initial_view" widget="radio"/>
-                                <field name="initial_page"/>
-                            </group>
-                            <group name="magnification" string="Magnification">
-                                <field name="magnification" widget="radio"/>
-                                <field name="zoom" attrs="{'invisible': [('magnification', '!=', '4')]}"/>
-                            </group>
-                        </group>
-                        <group name="initial_view-right">
-                            <field name="page_layout" widget="radio"/>
-                        </group>
-                    </group>
-                </page>
-                <page name="user_intf" string="User Interface">
-                    <group name="user_intf">
-                        <group name="user_intf-left" col="1">
-                            <group name="user_intf-window-options" string="Window Options">
-                                <field name="resize_windows_initial_page"/>
-                                <field name="center_window"/>
-                                <field name="open_fullscreen"/>
-                                <field name="display_document_title"/>
-                            </group>
-                        </group>
-                        <group name="user_intf-right" col="1">
-                            <group name="user_intf-options" string="User Interface Options">
-                                <field name="hide_menubar"/>
-                                <field name="hide_toolbar"/>
-                                <field name="hide_window_controls"/>
-                            </group>
-                            <group string="Bookmarks" name="bookmarks">
-                                <field name="open_bookmark_levels"/>
-                            </group>
-                        </group>
-                    </group>
-                </page>
-                <page string="Links" name="links">
-                    <group name="links" col="1">
-                        <group name="links-general" string="General">
-                            <field name="export_bookmarks_named_dest"/>
-                            <field name="convert_doc_ref_to_pdf_target"/>
-                            <field name="export_filesystem_urls"/>
-                        </group>
-                        <group name="links-cross-doc" string="Cross-document Links">
-                            <field name="cross_doc_link_action" widget="radio"/>
-                        </group>
-                    </group>
-                </page>
-                <page string="Security" name="security">
-                    <group name="security">
-                        <group name="security-left" attrs="{'invisible': [('pdfa', '=', True)]}">
-                            <field name="encrypt"/>
-                            <field name="document_password" password="True" attrs="{'invisible': [('encrypt', '!=', True)], 'required': [('encrypt', '=', True)]}"/>
-                            <field name="restrict_permissions"/>
-                            <field name="permission_password" password="True" attrs="{'invisible': [('restrict_permissions', '!=', True)], 'required': [('restrict_permissions', '=', True)]}"/>
-                        </group>
-                        <group name="security-right" attrs="{'invisible': ['|', ('pdfa', '=', True), ('restrict_permissions', '=', False)]}">
-                            <field name="printing" widget="radio"/>
-                            <field name="changes" widget="radio"/>
-                            <field name="content_copying_allowed"/>
-                            <field name="text_access_accessibility_tools_allowed"/>
-                        </group>
-                        <group 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>
-                </page>
-            </notebook>
-        </form>
-    </field>
-</record>
-
-<record id="py3o_pdf_options_tree" model="ir.ui.view">
-    <field name="name">py3o.pdf.options.tree</field>
-    <field name="model">py3o.pdf.options</field>
-    <field name="arch" type="xml">
-        <tree string="Py3o PDF Export Options">
-            <field name="name"/>
-        </tree>
-    </field>
-</record>
-
-<record id="py3o_pdf_options_action" model="ir.actions.act_window">
-    <field name="name">Py3o PDF Export Options</field>
-    <field name="res_model">py3o.pdf.options</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<menuitem id="py3o_pdf_options_menu"
-    parent="report_py3o.py3o_config_menu"
-    action="py3o_pdf_options_action"
-    sequence="40" />
-
-
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record id="py3o_pdf_options_tree" model="ir.ui.view">
+        <field name="name">py3o.pdf.options.tree</field>
+        <field name="model">py3o.pdf.options</field>
+        <field name="arch" type="xml">
+            <tree string="Py3o PDF Export Options">
+                <field name="name" />
+            </tree>
+        </field>
+    </record>
+    <record id="py3o_pdf_options_action" model="ir.actions.act_window">
+        <field name="name">Py3o PDF Export Options</field>
+        <field name="res_model">py3o.pdf.options</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="py3o_pdf_options_menu"
+        parent="report_py3o.py3o_config_menu"
+        action="py3o_pdf_options_action"
+        sequence="40"
+    />
 </odoo>
diff --git a/report_py3o_fusion_server/views/py3o_server.xml b/report_py3o_fusion_server/views/py3o_server.xml
index 2b245fc16..879cc0247 100644
--- a/report_py3o_fusion_server/views/py3o_server.xml
+++ b/report_py3o_fusion_server/views/py3o_server.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="py3o_server_configuration_form_view" model="ir.ui.view">
         <field name="name">py3o.server.configuration.form.view</field>
         <field name="model">py3o.server</field>
         <field name="arch" type="xml">
             <form string="Py3o Server Configuration">
                 <group name="main">
-                    <field name="url" widget="url"/>
-                    <field name="pdf_options_id"/>
+                    <field name="url" widget="url" />
+                    <field name="pdf_options_id" />
                     <field name="is_active" />
                 </group>
             </form>
         </field>
     </record>
-
     <record id="py3o_server_configuration_tree_view" model="ir.ui.view">
         <field name="name">py3o.server.configuration.tree.view</field>
         <field name="model">py3o.server</field>
         <field name="arch" type="xml">
             <tree string="Py3o Servers Configuration">
                 <field name="url" />
-                <field name="pdf_options_id"/>
+                <field name="pdf_options_id" />
                 <field name="is_active" />
             </tree>
         </field>
     </record>
-
     <record id="py3o_server_configuration_action" model="ir.actions.act_window">
         <field name="name">Py3o Servers</field>
         <field name="res_model">py3o.server</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem id="py3o_server_configuration_menu"
+    <menuitem
+        id="py3o_server_configuration_menu"
         parent="report_py3o.py3o_config_menu"
-        action="py3o_server_configuration_action" />
-
+        action="py3o_server_configuration_action"
+    />
 </odoo>