Merge PR #741 into 14.0

Signed-off-by etobella
OCA · Oct 28, 2023 · f39e114 · f39e114
2 parents 63b441e + 0d6095c
commit f39e114
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 54 deletions.
diff --git 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: gh: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: Server side features for usability and user experience related
 repo_name: Server UX
 repo_slug: server-ux
 repo_website: https://github.com/OCA/server-ux
-travis_apt_packages: []
-travis_apt_sources: []
 
diff --git 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

diff --git 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)"

diff --git 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

diff --git 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/server-ux"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=server-ux
+          - --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:

diff --git a/barcode_action/demo/barcode_action_demo.xml b/barcode_action/demo/barcode_action_demo.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
         <record id="res_partner_find" model="ir.actions.act_window">
             <field name="name">Find Partner</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">barcode.action</field>
             <field name="view_mode">form</field>
             <field
-                name="context"
-            >{'default_model': 'res.partner', 'default_method': 'find_res_partner_by_ref_using_barcode'}</field>
+            name="context"
+        >{'default_model': 'res.partner', 'default_method': 'find_res_partner_by_ref_using_barcode'}</field>
             <field name="target">new</field>
         </record>
         <menuitem
-            id="menu_orders_customers"
-            name="Find partners"
-            action="res_partner_find"
-            parent="base.menu_administration"
-        />
-    </data>
+        id="menu_orders_customers"
+        name="Find partners"
+        action="res_partner_find"
+        parent="base.menu_administration"
+    />
 </odoo>
diff --git a/base_export_manager/views/ir_exports.xml b/base_export_manager/views/ir_exports.xml
@@ -17,7 +17,7 @@
         <field name="name">Export Profile tree</field>
         <field name="model">ir.exports</field>
         <field name="arch" type="xml">
-            <tree string="Export Profiles">
+            <tree>
                 <field name="name" />
                 <field name="model_id" />
                 <field name="resource" />

diff --git a/base_import_security_group/demo/assets.xml b/base_import_security_group/demo/assets.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
         <template
-            id="assets_tests"
-            name="Base Import Security Group Assets Tests"
-            inherit_id="web.assets_tests"
-        >
+        id="assets_tests"
+        name="Base Import Security Group Assets Tests"
+        inherit_id="web.assets_tests"
+    >
             <xpath expr="." position="inside">
                 <script
-                    type="text/javascript"
-                    src="/base_import_security_group/static/src/js/tour_import.js"
-                />
+                type="text/javascript"
+                src="/base_import_security_group/static/src/js/tour_import.js"
+            />
             </xpath>
         </template>
-    </data>
 </odoo>
diff --git a/base_tier_validation/views/tier_definition_view.xml b/base_tier_validation/views/tier_definition_view.xml
@@ -6,7 +6,7 @@
         <field name="name">tier.definition.tree</field>
         <field name="model">tier.definition</field>
         <field name="arch" type="xml">
-            <tree string="Tier Definition">
+            <tree>
                 <field name="model_id" />
                 <field name="name" />
                 <field name="review_type" />

diff --git a/base_tier_validation/views/tier_review_view.xml b/base_tier_validation/views/tier_review_view.xml
@@ -7,7 +7,6 @@
         <field name="model">tier.review</field>
         <field name="arch" type="xml">
             <tree
-                string="Tier Review"
                 decoration-danger="status=='rejected'"
                 decoration-success="status=='approved'"
             >

diff --git a/base_tier_validation_correction/i18n/base_tier_validation_correction.pot b/base_tier_validation_correction/i18n/base_tier_validation_correction.pot
@@ -249,7 +249,6 @@ msgstr ""
 
 #. module: base_tier_validation_correction
 #: model:ir.model.fields,help:base_tier_validation_correction.field_tier_correction__message_has_error
-#: model:ir.model.fields,help:base_tier_validation_correction.field_tier_correction__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -458,11 +457,6 @@ msgstr ""
 msgid "Reviewer(s)"
 msgstr ""
 
-#. module: base_tier_validation_correction
-#: model:ir.model.fields,field_description:base_tier_validation_correction.field_tier_correction__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
 #. module: base_tier_validation_correction
 #: model_terms:ir.ui.view,arch_db:base_tier_validation_correction.tier_correction_view_form
 msgid "Scheduled Action"

diff --git a/base_tier_validation_correction/security/correction_groups.xml b/base_tier_validation_correction/security/correction_groups.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-<data noupdate="0">
+<odoo noupdate="0">
 
     <record id="group_tier_correction" model="res.groups">
         <field name="name">Tier Review Correction</field>
         <field name="category_id" ref="base.module_category_hidden" />
         <field
-                name="users"
-                eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
-            />
+            name="users"
+            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
+        />
     </record>
-
-</data>
 </odoo>
diff --git a/base_tier_validation_correction/views/tier_correction_view.xml b/base_tier_validation_correction/views/tier_correction_view.xml
@@ -6,7 +6,7 @@
         <field name="name">tier.correction.tree</field>
         <field name="model">tier.correction</field>
         <field name="arch" type="xml">
-            <tree string="Tier Correction">
+            <tree>
                 <field name="name" />
                 <field name="correction_type" />
                 <field name="reference" />

diff --git a/base_tier_validation_report/reports/tier_review_report.xml b/base_tier_validation_report/reports/tier_review_report.xml
@@ -5,7 +5,6 @@
         <field name="priority" eval="100" />
         <field name="arch" type="xml">
             <tree
-                string="Tier Review"
                 decoration-danger="status=='rejected'"
                 decoration-success="status=='approved'"
                 create="0"

diff --git a/chained_swapper/demo/chained_swapper_demo.xml b/chained_swapper/demo/chained_swapper_demo.xml
@@ -33,6 +33,7 @@
         }"
         />
     </record>
+    <!-- oca-hooks:disable=xml-duplicate-record-id -->
     <!-- pylint:disable=duplicate-xml-record-id -->
     <record id="chained_swapper_demo" model="chained.swapper">
         <field

diff --git a/date_range/static/src/js/date_range.js b/date_range/static/src/js/date_range.js
@@ -70,9 +70,9 @@ odoo.define("date_range.CustomFilterItem", function (require) {
                         condition.operator
                     ];
                     if (operator.date_range) {
-                        const eid = parseInt(ev.target.value);
+                        const eid = parseInt(ev.target.value, 10);
                         const ranges = this.date_ranges[operator.date_range_type];
-                        const range = ranges.find((x) => x.id == eid);
+                        const range = ranges.find((x) => x.id === eid);
                         const d_start = moment(`${range.date_start} 00:00:00Z`);
                         const d_end = moment(`${range.date_end} 23:59:59Z`);
                         condition.value = [d_start, d_end];

diff --git a/date_range/views/date_range_view.xml b/date_range/views/date_range_view.xml
@@ -4,7 +4,7 @@
         <field name="name">date.range.tree</field>
         <field name="model">date.range</field>
         <field name="arch" type="xml">
-            <tree editable="bottom" string="Date range">
+            <tree editable="bottom">
                 <field name="name" />
                 <field name="type_id" />
                 <field name="date_start" />
@@ -42,7 +42,7 @@
         <field name="name">date.range.type.tree</field>
         <field name="model">date.range.type</field>
         <field name="arch" type="xml">
-            <tree string="Date range type">
+            <tree>
                 <field name="name" />
                 <field name="allow_overlap" />
                 <field

diff --git a/sequence_range_end/models/ir_sequence.py b/sequence_range_end/models/ir_sequence.py
@@ -52,11 +52,11 @@ def _interpolation_dict():
                 "sec": "%S",
             }
             res = {}
-            for key, format in sequences.items():
-                res[key] = effective_date.strftime(format)
-                res["current_" + key] = now.strftime(format)
-                res["range_" + key] = range_date.strftime(format)
-                res["range_end_" + key] = range_end_date.strftime(format)
+            for key, sequence_format in sequences.items():
+                res[key] = effective_date.strftime(sequence_format)
+                res["current_" + key] = now.strftime(sequence_format)
+                res["range_" + key] = range_date.strftime(sequence_format)
+                res["range_end_" + key] = range_end_date.strftime(sequence_format)
             return res
 
         self.ensure_one()