Merge PR #805 into 14.0

Signed-off-by etobella
2025-02-16 16:30:38 +02:00 · 2023-11-07 13:31:29 +00:00
parent 33a1439e40 43eda5bc7c
commit f42cb0ca43
26 changed files with 101 additions and 97 deletions
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,8 +1,7 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.17.2
 _src_path: git+https://github.com/OCA/oca-addons-repo-template
 ci: GitHub
-dependency_installation_mode: PIP
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}
@@ -11,6 +10,7 @@ github_enable_makepot: true
 github_enable_stale_action: true
 github_enforce_dev_status_compatibility: true
 include_wkhtmltopdf: false
+odoo_test_flavor: Both
 odoo_version: 14.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
@@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
 repo_name: reporting-engine
 repo_slug: reporting-engine
 repo_website: https://github.com/OCA/reporting-engine
-travis_apt_packages: []
-travis_apt_sources: []

--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
  odoo: readonly
  openerp: readonly
  owl: readonly
+  luxon: readonly

 # Styling is handled by Prettier, so we only need to enable AST rules;
 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -13,8 +13,10 @@ jobs:
  pre-commit:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
      - name: Get python version
        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
      - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
        run: pip install pre-commit
      - name: Run pre-commit
        run: pre-commit run --all-files --show-diff-on-failure --color=always
+        env:
+          # Consider valid a PR that changes README fragments but doesn't
+          # change the README.rst file itself. It's not really a problem
+          # because the bot will update it anyway after merge. This way, we
+          # lower the barrier for functional contributors that want to fix the
+          # readme fragments, while still letting developers get README
+          # auto-generated (which also helps functionals when using runboat).
+          # DOCS https://pre-commit.com/#temporarily-disabling-hooks
+          SKIP: oca-gen-addon-readme
      - name: Check that all files generated by pre-commit are in git
        run: |
          newfiles="$(git ls-files --others --exclude-from=.gitignore)"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    name: Detect unreleased dependencies
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - run: |
          for reqfile in requirements.txt test-requirements.txt ; do
              if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
      matrix:
        include:
          - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
-            makepot: "true"
            name: test with Odoo
          - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
            name: test with OCB
+            makepot: "true"
    services:
      postgres:
        image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
        ports:
          - 5432:5432
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
      - name: Install addons and dependencies
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,8 @@ exclude: |
  /static/(src/)?lib/|
  # Repos using Sphinx to generate docs don't need prettying
  ^docs/_templates/.*\.html$|
+  # Don't bother non-technical authors with formatting issues in docs
+  readme/.*\.(rst|md)$|
  # You don't usually want a bot to modify your legal texts
  (LICENSE.*|COPYING.*)
 default_language_version:
@@ -33,12 +35,24 @@ repos:
        language: fail
        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
  - repo: https://github.com/oca/maintainer-tools
-    rev: ab1d7f6
+    rev: 969238e47c07d0c40573acff81d170f63245d738
    hooks:
      # update the NOT INSTALLABLE ADDONS section above
      - id: oca-update-pre-commit-excluded-addons
      - id: oca-fix-manifest-website
        args: ["https://github.com/OCA/reporting-engine"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=reporting-engine
+          - --if-source-changed
+  - repo: https://github.com/OCA/odoo-pre-commit-hooks
+    rev: v0.0.25
+    hooks:
+      - id: oca-checks-odoo-module
+      - id: oca-checks-po
  - repo: https://github.com/myint/autoflake
    rev: v1.4
    hooks:
--- a/base_comment_template/i18n/base_comment_template.pot
+++ b/base_comment_template/i18n/base_comment_template.pot
@@ -93,7 +93,6 @@ msgstr ""
 #: model:ir.ui.menu,name:base_comment_template.reports_base_comment_template_menuitem
 #: model_terms:ir.ui.view,arch_db:base_comment_template.view_base_comment_template_form
 #: model_terms:ir.ui.view,arch_db:base_comment_template.view_base_comment_template_search
-#: model_terms:ir.ui.view,arch_db:base_comment_template.view_base_comment_template_tree
 #: model_terms:ir.ui.view,arch_db:base_comment_template.view_partner_form
 msgid "Comment Templates"
 msgstr ""
--- a/base_comment_template/views/base_comment_template_view.xml
+++ b/base_comment_template/views/base_comment_template_view.xml
@@ -4,7 +4,7 @@
        <field name="name">base.comment.template.search</field>
        <field name="model">base.comment.template</field>
        <field name="arch" type="xml">
-            <tree string="Comment Templates">
+            <tree name="Comment Templates">
                <field name="sequence" widget="handle" />
                <field name="name" />
                <field name="position" />
--- a/base_comment_template/wizard/base_comment_template_preview_views.xml
+++ b/base_comment_template/wizard/base_comment_template_preview_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
        <!-- SMS Template Preview -->
        <record model="ir.ui.view" id="base_comment_template_preview_form">
            <field name="name">base.comment.template.preview.form</field>
@@ -9,33 +8,33 @@
                <form string="Base Comment Preview">
                    <h3>Preview of
                        <field
-                            name="base_comment_template_id"
-                            readonly="1"
-                            nolabel="1"
-                            class="oe_inline"
-                        />
+                        name="base_comment_template_id"
+                        readonly="1"
+                        nolabel="1"
+                        class="oe_inline"
+                    />
                    </h3>
                    <field name="no_record" invisible="1" />
                    <field name="model_ids" />
                    <div class="o_row">
                        <span>Choose an example
                            <field
-                                name="model_id"
-                                domain="[('id', 'in', model_ids or False)]"
-                            />
+                            name="model_id"
+                            domain="[('id', 'in', model_ids or False)]"
+                        />
                            record:
                        </span>
                        <div>
                            <field
-                                name="resource_ref"
-                                class="oe_inline"
-                                options="{'hide_model': True, 'no_create': True, 'no_edit': True, 'no_open': True}"
-                                attrs="{'invisible': [('no_record', '=', True)]}"
-                            />
+                            name="resource_ref"
+                            class="oe_inline"
+                            options="{'hide_model': True, 'no_create': True, 'no_edit': True, 'no_open': True}"
+                            attrs="{'invisible': [('no_record', '=', True)]}"
+                        />
                            <span
-                                class="text-warning"
-                                attrs="{'invisible': [('no_record', '=', False)]}"
-                            >No records
+                            class="text-warning"
+                            attrs="{'invisible': [('no_record', '=', False)]}"
+                        >No records
                            </span>
                        </div>
                    </div>
@@ -48,18 +47,18 @@
                    <label for="body" string="Base Comment content" />
                    <hr />
                    <field
-                        name="body"
-                        readonly="1"
-                        nolabel="1"
-                        options='{"safe": True}'
-                    />
+                    name="body"
+                    readonly="1"
+                    nolabel="1"
+                    options='{"safe": True}'
+                />
                    <hr />
                    <footer>
                        <button
-                            string="Discard"
-                            class="btn-secondary"
-                            special="cancel"
-                        />
+                        string="Discard"
+                        class="btn-secondary"
+                        special="cancel"
+                    />
                    </footer>
                </form>
            </field>
@@ -76,5 +75,4 @@
        </record>


-    </data>
 </odoo>
--- a/bi_sql_editor/models/bi_sql_view.py
+++ b/bi_sql_editor/models/bi_sql_view.py
@@ -450,7 +450,7 @@ class BiSQLView(models.Model):
            "type": "tree",
            "model": self.model_id.model,
            "arch": """<?xml version="1.0"?>"""
-            """<tree string="Analysis">{}"""
+            """<tree name="Analysis">{}"""
            """</tree>""".format(
                "".join([x._prepare_tree_field() for x in self.bi_sql_view_field_ids])
            ),
--- a/report_async/data/mail_template.xml
+++ b/report_async/data/mail_template.xml
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
        <record id="async_report_delivery" model="mail.template">
            <field name="name">Report Async: New Report Available</field>
            <field name="model_id" ref="base.model_ir_attachment" />
            <field name="subject">Your report is available, ${object.name}</field>
            <field
-                name="email_from"
-            >${object.company_id.partner_id.email_formatted|safe}</field>
+            name="email_from"
+        >${object.company_id.partner_id.email_formatted|safe}</field>
            <field name="partner_to">${user.partner_id.id}</field>
            <field name="body_html" type="html">
                <table
-                    border="0"
-                    cellpadding="0"
-                    cellspacing="0"
-                    style="background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"
-                >
+                border="0"
+                cellpadding="0"
+                cellspacing="0"
+                style="background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"
+            >
                    <tr>
                        <td align="center">
                            <table
-                                border="0"
-                                cellpadding="0"
-                                cellspacing="0"
-                                width="590"
-                                style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"
-                            >
+                            border="0"
+                            cellpadding="0"
+                            cellspacing="0"
+                            width="590"
+                            style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"
+                        >
                                <tbody>
                                    <tr>
                                        <td align="center" style="min-width: 590px;">
                                            <table
-                                                border="0"
-                                                cellpadding="0"
-                                                cellspacing="0"
-                                                width="590"
-                                                style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"
-                                            >
+                                            border="0"
+                                            cellpadding="0"
+                                            cellspacing="0"
+                                            width="590"
+                                            style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"
+                                        >
                                                <tr>
                                                    <td
-                                                        valign="top"
-                                                        style="font-size: 13px;"
-                                                    >
+                                                    valign="top"
+                                                    style="font-size: 13px;"
+                                                >
                                        % set base_url_async = object.env['ir.config_parameter'].sudo().get_param('web.base.url.async_reports')
                                        % set base_url = base_url_async or object.env['ir.config_parameter'].sudo().get_param('web.base.url')
                                        % set download_url = '%s/web/content/ir.attachment/%s/datas/%s?download=true' % (base_url, object.id, object.name, )
@@ -47,10 +46,10 @@
                                            Dear ${object.create_uid.partner_id.name or ''},
                                            <br /><br />
                                            Your requested report, ${object.name}, is available for <b
-                                                            >
+                                                        >
                                                                <a
-                                                                    href='${download_url}'
-                                                                >download</a>
+                                                                href='${download_url}'
+                                                            >download</a>
                                                            </b>.
                                            <br /><br />
                                            Have a nice day!<br />
@@ -69,5 +68,4 @@
            </field>
            <field name="auto_delete" eval="True" />
        </record>
-    </data>
 </odoo>
--- a/report_async/i18n/report_async.pot
+++ b/report_async/i18n/report_async.pot
@@ -385,7 +385,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_async.action_report_async
 #: model:ir.ui.menu,name:report_async.menu_report_async
 #: model_terms:ir.ui.view,arch_db:report_async.view_report_async_search
-#: model_terms:ir.ui.view,arch_db:report_async.view_report_async_tree
 msgid "Report Center"
 msgstr ""

--- a/report_async/views/report_async.xml
+++ b/report_async/views/report_async.xml
@@ -4,7 +4,7 @@
        <field name="name">report.async.tree</field>
        <field name="model">report.async</field>
        <field name="arch" type="xml">
-            <tree string="Report Center">
+            <tree name="Report Center">
                <field name="action_id" context="{'access_sudo': True}" />
                <button type="object" name="run_now" string="Run Now" icon="fa-bolt" />
                <button
--- a/report_context/data/config_parameter.xml
+++ b/report_context/data/config_parameter.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
        <record
-            id="report_default_context"
-            model="ir.config_parameter"
-            forcecreate="True"
-        >
+        id="report_default_context"
+        model="ir.config_parameter"
+        forcecreate="True"
+    >
            <field name="key">report.default.context</field>
            <field name="value">{}</field>
        </record>
-    </data>
 </odoo>
--- a/report_label/data/paperformat_label.xml
+++ b/report_label/data/paperformat_label.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">

        <record id="agipa_114016" model="report.paperformat.label">
            <field name="name">Label: Agipa 114016</field>
@@ -22,6 +21,4 @@
            <field name="label_margin_bottom" eval="1" />
            <field name="label_margin_left" eval="1" />
        </record>
-
-    </data>
 </odoo>
--- a/report_label/i18n/report_label.pot
+++ b/report_label/i18n/report_label.pot
@@ -207,7 +207,6 @@ msgstr ""

 #. module: report_label
 #: model:ir.actions.act_window,name:report_label.paperformat_label_action
-#: model_terms:ir.ui.view,arch_db:report_label.paperformat_label_view_tree
 msgid "Label paper format configuration"
 msgstr ""

--- a/report_label/views/report_paperformat_label.xml
+++ b/report_label/views/report_paperformat_label.xml
@@ -43,7 +43,7 @@
    <record id="paperformat_label_view_tree" model="ir.ui.view">
        <field name="model">report.paperformat.label</field>
        <field name="arch" type="xml">
-            <tree string="Label paper format configuration">
+            <tree name="Label paper format configuration">
                <field name="name" />
                <field name="label_height" />
                <field name="label_width" />
--- a/report_layout_config/templates/report_templates.xml
+++ b/report_layout_config/templates/report_templates.xml
@@ -4,6 +4,7 @@
        id="external_standard_layout_images_template"
        primary="True"
        inherit_id="web.external_layout_standard"
+        priority="99"
    >
        <xpath expr="//div[contains(@t-attf-class, 'header')]" position="replace">
            <div class="header">
@@ -45,6 +46,7 @@
        id="external_clean_layout_images_template"
        primary="True"
        inherit_id="web.external_layout_clean"
+        priority="99"
    >
        <xpath expr="//div[contains(@t-attf-class, 'header')]" position="replace">
            <div class="header">
--- a/report_py3o/i18n/report_py3o.pot
+++ b/report_py3o/i18n/report_py3o.pot
@@ -219,7 +219,6 @@ msgstr ""
 #: model:ir.ui.menu,name:report_py3o.py3o_template_configuration_menu
 #: model_terms:ir.ui.view,arch_db:report_py3o.py3o_template_configuration_form_view
 #: model_terms:ir.ui.view,arch_db:report_py3o.py3o_template_configuration_search_view
-#: model_terms:ir.ui.view,arch_db:report_py3o.py3o_template_configuration_tree_view
 msgid "Py3o Templates"
 msgstr ""

--- a/report_py3o/views/py3o_template.xml
+++ b/report_py3o/views/py3o_template.xml
@@ -34,7 +34,7 @@
        <field name="name">py3o.template.configuration.tree.view</field>
        <field name="model">py3o.template</field>
        <field name="arch" type="xml">
-            <tree string="Py3o Templates">
+            <tree name="Py3o Templates">
                <field name="name" />
                <field name="filetype" />
            </tree>
--- a/report_py3o_fusion_server/i18n/report_py3o_fusion_server.pot
+++ b/report_py3o_fusion_server/i18n/report_py3o_fusion_server.pot
@@ -498,7 +498,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_py3o_fusion_server.py3o_pdf_options_action
 #: model:ir.ui.menu,name:report_py3o_fusion_server.py3o_pdf_options_menu
 #: model_terms:ir.ui.view,arch_db:report_py3o_fusion_server.py3o_pdf_options_form
-#: model_terms:ir.ui.view,arch_db:report_py3o_fusion_server.py3o_pdf_options_tree
 msgid "Py3o PDF Export Options"
 msgstr ""

@@ -513,11 +512,6 @@ msgstr ""
 msgid "Py3o Servers"
 msgstr ""

-#. module: report_py3o_fusion_server
-#: model_terms:ir.ui.view,arch_db:report_py3o_fusion_server.py3o_server_configuration_tree_view
-msgid "Py3o Servers Configuration"
-msgstr ""
-
 #. module: report_py3o_fusion_server
 #: model:ir.model,name:report_py3o_fusion_server.model_py3o_server
 msgid "Py3o server"
--- a/report_py3o_fusion_server/views/py3o_pdf_options.xml
+++ b/report_py3o_fusion_server/views/py3o_pdf_options.xml
@@ -182,7 +182,7 @@
        <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">
+            <tree name="Py3o PDF Export Options">
                <field name="name" />
            </tree>
        </field>
--- a/report_py3o_fusion_server/views/py3o_server.xml
+++ b/report_py3o_fusion_server/views/py3o_server.xml
@@ -17,7 +17,7 @@
        <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">
+            <tree name="Py3o Servers Configuration">
                <field name="url" />
                <field name="pdf_options_id" />
                <field name="is_active" />
--- a/report_qweb_element_page_visibility/views/layouts.xml
+++ b/report_qweb_element_page_visibility/views/layouts.xml
@@ -1,5 +1,5 @@
 <odoo>
-    <template id="minimal_layout" inherit_id="web.minimal_layout">
+    <template id="minimal_layout" inherit_id="web.minimal_layout" priority="99">
        <xpath expr="//t[@t-if='subst_needed']" position="replace">
            <t t-if="subst is True">
                <script>
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
        <record id="demo_reports" model="ir.actions.report">
            <field name="name">Demo report</field>
            <field name="model">res.users</field>
@@ -30,5 +29,4 @@
                </t>
            </t>
        </template>
-    </data>
 </odoo>
--- a/report_qweb_signer/i18n/report_qweb_signer.pot
+++ b/report_qweb_signer/i18n/report_qweb_signer.pot
@@ -166,7 +166,6 @@ msgstr ""

 #. module: report_qweb_signer
 #: model:ir.model.fields,field_description:report_qweb_signer.field_res_company__report_certificate_ids
-#: model_terms:ir.ui.view,arch_db:report_qweb_signer.view_report_certificate_tree
 msgid "PDF report certificates"
 msgstr ""

--- a/report_qweb_signer/views/report_certificate_view.xml
+++ b/report_qweb_signer/views/report_certificate_view.xml
@@ -60,7 +60,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
        <field name="name">report.certificate.tree</field>
        <field name="model">report.certificate</field>
        <field name="arch" type="xml">
-            <tree string="PDF report certificates">
+            <tree name="PDF report certificates">
                <field name="sequence" widget="handle" />
                <field name="name" />
                <field name="path" />