Merge PR #90 into 14.0

Signed-off-by dreispt
OCA · Dec 9, 2023 · a03cd41 · a03cd41
2 parents 2e83b6e + 11d3532
commit a03cd41
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 36 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,8 +1,8 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.19.2
 _src_path: gh:oca/oca-addons-repo-template
 ci: GitHub
-dependency_installation_mode: PIP
+convert_readme_fragments_to_markdown: false
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}
@@ -11,6 +11,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 +20,6 @@ repo_description: 'TODO: add repo description.'
 repo_name: l10n-portugal
 repo_slug: l10n-portugal
 repo_website: https://github.com/OCA/l10n-portugal
-travis_apt_packages: []
-travis_apt_sources: []
+use_pyproject_toml: false
+use_ruff: false
 
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/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 /.venv
 /.pytest_cache
+/.ruff_cache
 
 # C extensions
 *.so

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,6 +12,10 @@ 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)$|
+  # Ignore build and dist directories in addons
+  /build/|/dist/|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
@@ -33,12 +37,25 @@ repos:
         language: fail
         files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
-    rev: ab1d7f6
+    rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
     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-portugal"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=l10n-portugal
+          - --if-source-changed
+          - --keep-source-digest
+  - 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/l10n_pt_account_invoicexpress/views/res_config_settings.xml b/l10n_pt_account_invoicexpress/views/res_config_settings.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <data>
         <record id="res_config_settings_view_form" model="ir.ui.view">
             <field name="name">res.config.settings.view.form.invoicexpress</field>
             <field name="priority" eval="200" />
@@ -13,34 +12,32 @@
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_right_pane">
                                     <a
-                                        href="https://www.app.invoicexpress.com/users/api"
-                                        target="_blank"
-                                    ><i
-                                            class="fa fa-arrow-right"
-                                        /> Generate an API key</a>
+                                    href="https://www.app.invoicexpress.com/users/api"
+                                    target="_blank"
+                                ><i class="fa fa-arrow-right" /> Generate an API key</a>
                                     <div
-                                        class="content-group"
-                                        name="invoicexpress_options"
-                                    >
+                                    class="content-group"
+                                    name="invoicexpress_options"
+                                >
                                         <div class="mt16">
                                             <label
-                                                for="invoicexpress_account_name"
-                                                string="InvoiceXpress Account Name"
-                                            />
+                                            for="invoicexpress_account_name"
+                                            string="InvoiceXpress Account Name"
+                                        />
                                             <field name="invoicexpress_account_name" />
                                         </div>
                                         <div class="mt16">
                                             <label
-                                                for="invoicexpress_api_key"
-                                                string="InvoiceXpress API Key"
-                                            />
+                                            for="invoicexpress_api_key"
+                                            string="InvoiceXpress API Key"
+                                        />
                                             <field name="invoicexpress_api_key" />
                                         </div>
                                         <div class="mt16">
                                             <label
-                                                for="invoicexpress_template_id"
-                                                string="InvoiceXpress Invoice Email Template"
-                                            />
+                                            for="invoicexpress_template_id"
+                                            string="InvoiceXpress Invoice Email Template"
+                                        />
                                             <field name="invoicexpress_template_id" />
                                         </div>
                                     </div>
@@ -51,5 +48,4 @@
                 </xpath>
             </field>
         </record>
-    </data>
 </odoo>
diff --git a/l10n_pt_stock_invoicexpress/models/stock_picking.py b/l10n_pt_stock_invoicexpress/models/stock_picking.py
@@ -103,8 +103,10 @@ def _compute_invoicexpress_doc_type(self):
 
     def _send_confirmation_email(self):
         # Only send Delivery emails if the InvoiceXpress checkbox is selected
-        to_send = self.filtered("invoicexpress_send_email")
-        super(StockPicking, to_send)._send_confirmation_email()
+        dont_send = self.filtered(
+            lambda x: x.can_invoicexpress and not x.invoicexpress_send_email
+        )
+        super(StockPicking, self - dont_send)._send_confirmation_email()
 
     @api.model
     def _get_invoicexpress_prefix(self, doctype):

diff --git a/l10n_pt_stock_invoicexpress/views/res_config_settings.xml b/l10n_pt_stock_invoicexpress/views/res_config_settings.xml
@@ -1,5 +1,4 @@
 <odoo>
-    <data>
         <record id="res_config_settings_view_form" model="ir.ui.view">
             <field name="name">res.config.settings.view.form.invoicexpress</field>
             <field name="priority" eval="200" />
@@ -9,13 +8,12 @@
                 <div name="invoicexpress_options" position="after">
                     <div class="mt16">
                         <label
-                            for="invoicexpress_delivery_template_id"
-                            string="InvoiceXpress Delivery Email"
-                        />
+                        for="invoicexpress_delivery_template_id"
+                        string="InvoiceXpress Delivery Email"
+                    />
                         <field name="invoicexpress_delivery_template_id" />
                     </div>
                 </div>
             </field>
         </record>
-    </data>
 </odoo>
diff --git a/l10n_pt_vat/views/vat_adjustment_norm_view.xml b/l10n_pt_vat/views/vat_adjustment_norm_view.xml
@@ -22,7 +22,7 @@
         <field name="priority">100</field>
         <field name="arch" type="xml">
 
-            <tree string="VAT Adjustment Norm">
+            <tree>
                 <field name="name" />
                 <field name="note" />
             </tree>