Merge PR #278 into 14.0

Signed-off-by pedrobaeza
OCA · Oct 31, 2023 · bba8eba · bba8eba
2 parents 5895a1a + c6cfdbe
commit bba8eba
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 50 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: false
 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: Odoo Accountant closing tools
 repo_name: account-closing
 repo_slug: account-closing
 repo_website: https://github.com/OCA/account-closing
-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/account-closing"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=account-closing
+          - --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/account_cutoff_accrual_picking/i18n/de.po b/account_cutoff_accrual_picking/i18n/de.po
@@ -79,7 +79,7 @@ msgid ""
 "'%s'."
 msgstr ""
 "Fehlendes Aufwandskonto zum Produkt '%s' oder der zugehörigen "
-"Produktkategorie"
+"Produktkategorie '%s'."
 
 #. module: account_cutoff_accrual_picking
 #: code:addons/account_cutoff_accrual_picking/models/account_cutoff.py:0
@@ -89,6 +89,7 @@ msgid ""
 "'%s'."
 msgstr ""
 "Fehlendes Erlöskonto zum Produkt '%s' oder der zugehörigen Produktkategorie"
+"'%s'."
 
 #. module: account_cutoff_accrual_picking
 #: code:addons/account_cutoff_accrual_picking/models/account_cutoff.py:0

diff --git a/account_cutoff_base/i18n/account_cutoff_base.pot b/account_cutoff_base/i18n/account_cutoff_base.pot
@@ -446,7 +446,6 @@ msgstr ""
 
 #. module: account_cutoff_base
 #: model:ir.model.fields,help:account_cutoff_base.field_account_cutoff__message_has_error
-#: model:ir.model.fields,help:account_cutoff_base.field_account_cutoff__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -663,11 +662,6 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
-#. module: account_cutoff_base
-#: model:ir.model.fields,field_description:account_cutoff_base.field_account_cutoff__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
 #. module: account_cutoff_base
 #: model_terms:ir.ui.view,arch_db:account_cutoff_base.account_cutoff_filter
 msgid "Search Cut-offs"

diff --git a/account_fiscal_year_closing/views/account_fiscalyear_closing_template_views.xml b/account_fiscal_year_closing/views/account_fiscalyear_closing_template_views.xml
@@ -6,7 +6,7 @@
     <record id="view_account_fiscalyear_closing_template_tree" model="ir.ui.view">
         <field name="model">account.fiscalyear.closing.template</field>
         <field name="arch" type="xml">
-            <tree string="Fiscal year closing">
+            <tree>
                 <field name="name" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="move_config_ids" />

diff --git a/account_fiscal_year_closing/views/account_fiscalyear_closing_views.xml b/account_fiscal_year_closing/views/account_fiscalyear_closing_views.xml
@@ -7,7 +7,7 @@
         <field name="name">account.fiscalyear.closing.tree</field>
         <field name="model">account.fiscalyear.closing</field>
         <field name="arch" type="xml">
-            <tree string="Fiscal year closing">
+            <tree>
                 <field name="name" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="date_start" />

diff --git a/account_multicurrency_revaluation/views/account_move_views.xml b/account_multicurrency_revaluation/views/account_move_views.xml
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record id="view_move_form" model="ir.ui.view">
-            <field name="model">account.move</field>
-            <field name="inherit_id" ref="account.view_move_form" />
-            <field name="arch" type="xml">
-                <group name="misc_group">
-                    <field
-                        name="revaluation_to_reverse"
-                        attrs="{'readonly':[('reversed_entry_id', '!=', False)]}"
-                    />
-                </group>
-            </field>
-        </record>
-        <record id="view_account_move_filter" model="ir.ui.view">
-            <field name="model">account.move</field>
-            <field name="inherit_id" ref="account.view_account_move_filter" />
-            <field name="arch" type="xml">
-                <filter name="posted" position="after">
-                    <filter
-                        string="Revaluation To Reverse"
-                        name="revaluation_to_reverse"
-                        domain="[('revaluation_to_reverse', '=', True)]"
-                    />
-                    <filter
-                        string="Revaluation Reversed"
-                        name="revaluation_reversed"
-                        domain="[('revaluation_reversed', '=', True)]"
-                    />
-                </filter>
-            </field>
-        </record>
-    </data>
+    <record id="view_move_form" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form" />
+        <field name="arch" type="xml">
+            <group name="misc_group">
+                <field
+                    name="revaluation_to_reverse"
+                    attrs="{'readonly':[('reversed_entry_id', '!=', False)]}"
+                />
+            </group>
+        </field>
+    </record>
+    <record id="view_account_move_filter" model="ir.ui.view">
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_account_move_filter" />
+        <field name="arch" type="xml">
+            <filter name="posted" position="after">
+                <filter
+                    string="Revaluation To Reverse"
+                    name="revaluation_to_reverse"
+                    domain="[('revaluation_to_reverse', '=', True)]"
+                />
+                <filter
+                    string="Revaluation Reversed"
+                    name="revaluation_reversed"
+                    domain="[('revaluation_reversed', '=', True)]"
+                />
+            </filter>
+        </field>
+    </record>
 </odoo>