Merge PR #713 into 14.0

Signed-off-by etobella
OCA · Oct 30, 2023 · 27a98e2 · 27a98e2
2 parents d20f165 + fab1a32
commit 27a98e2
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 74 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,16 +1,12 @@
 # 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: Travis
 dependency_installation_mode: PIP
 generate_requirements_txt: true
-github_check_license: true
-github_ci_extra_env: {}
-github_enable_codecov: true
-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

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/.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/l10n-switzerland"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=l10n-switzerland
+          - --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/ebill_paynet/data/mail_activity_type.xml b/ebill_paynet/data/mail_activity_type.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="mail_activity_dws_error" model="mail.activity.type">
-            <field name="name">Paynet System Error</field>
-            <field name="icon">fa-warning</field>
-            <field name="delay_count">0</field>
-            <field name="sequence">99</field>
-            <field name="decoration_type">warning</field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="mail_activity_dws_error" model="mail.activity.type">
+        <field name="name">Paynet System Error</field>
+        <field name="icon">fa-warning</field>
+        <field name="delay_count">0</field>
+        <field name="sequence">99</field>
+        <field name="decoration_type">warning</field>
+    </record>
 </odoo>
diff --git a/l10n_ch_base_bank/views/bank.xml b/l10n_ch_base_bank/views/bank.xml
@@ -1,61 +1,59 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record id="view_bank_search" model="ir.ui.view">
-            <field name="name">res.bank.search</field>
-            <field name="model">res.bank</field>
-            <field name="arch" type="xml">
-                <search string="Banks">
-                    <filter
-                        name="Postfinance"
-                        string="PostFinance"
-                        domain="[('bic', '=', 'POFICHBEXXX')]"
-                        help="PostFinance"
-                    />
-                    <field name="name" />
-                    <field name="code" />
-                    <field name="street" />
-                    <field name="city" />
-                </search>
+    <record id="view_bank_search" model="ir.ui.view">
+        <field name="name">res.bank.search</field>
+        <field name="model">res.bank</field>
+        <field name="arch" type="xml">
+            <search string="Banks">
+                <filter
+                    name="Postfinance"
+                    string="PostFinance"
+                    domain="[('bic', '=', 'POFICHBEXXX')]"
+                    help="PostFinance"
+                />
+                <field name="name" />
+                <field name="code" />
+                <field name="street" />
+                <field name="city" />
+            </search>
+        </field>
+    </record>
+    <!-- 'POFICHBEXXX' corresponds to Postfinance bic -->
+    <record model="ir.ui.view" id="add_custom_fields_on_bank">
+        <field name="name">add custom fields on bank</field>
+        <field name="model">res.bank</field>
+        <field name="inherit_id" ref="base.view_res_bank_form" />
+        <field name="arch" type="xml">
+            <field name="bic" position="after">
+                <field name="code" />
+                <field name="clearing" />
             </field>
-        </record>
-        <!-- 'POFICHBEXXX' corresponds to Postfinance bic -->
-        <record model="ir.ui.view" id="add_custom_fields_on_bank">
-            <field name="name">add custom fields on bank</field>
-            <field name="model">res.bank</field>
-            <field name="inherit_id" ref="base.view_res_bank_form" />
-            <field name="arch" type="xml">
-                <field name="bic" position="after">
-                    <field name="code" />
-                    <field name="clearing" />
-                </field>
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="country_code" invisible="True" />
-                </xpath>
-                <xpath expr="//field[@name='city']" position="attributes">
-                    <attribute
-                        name="attrs"
-                    >{'required': [('country_code', '=', 'CH')]}</attribute>
-                </xpath>
-                <xpath expr="//field[@name='bic']" position="attributes">
-                    <attribute
-                        name="attrs"
-                    >{'required': [('country_code', '=', 'CH')]}</attribute>
-                </xpath>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="country_code" invisible="True" />
+            </xpath>
+            <xpath expr="//field[@name='city']" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'required': [('country_code', '=', 'CH')]}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='bic']" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'required': [('country_code', '=', 'CH')]}</attribute>
+            </xpath>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="add_custom_fields_on_bank_list">
+        <field name="name">add custom fields on bank list</field>
+        <field name="model">res.bank</field>
+        <field name="inherit_id" ref="base.view_res_bank_tree" />
+        <field name="arch" type="xml">
+            <field name="bic" position="after">
+                <field name="code" />
+                <field name="clearing" />
+                <field name="street" />
+                <field name="city" />
             </field>
-        </record>
-        <record model="ir.ui.view" id="add_custom_fields_on_bank_list">
-            <field name="name">add custom fields on bank list</field>
-            <field name="model">res.bank</field>
-            <field name="inherit_id" ref="base.view_res_bank_tree" />
-            <field name="arch" type="xml">
-                <field name="bic" position="after">
-                    <field name="code" />
-                    <field name="clearing" />
-                    <field name="street" />
-                    <field name="city" />
-                </field>
-            </field>
-        </record>
-    </data>
+        </field>
+    </record>
 </odoo>