From 0c38f1f0ef5241f120e3da68fe80b26bfe3784b4 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 21:38:06 +0200 Subject: [PATCH 1/5] [IMP] update dotfiles --- .copier-answers.yml | 6 ++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++++++++++- .github/workflows/test.yml | 6 +++--- .pre-commit-config.yaml | 16 +++++++++++++++- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 01d042d0..c544d338 100644 --- 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 @@ -20,6 +20,4 @@ repo_description: This repository contains Odoo localization modules for Belgium repo_name: Belgian Localization repo_slug: l10n-belgium repo_website: https://github.com/OCA/l10n-belgium -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc68..fed88d70 100644 --- 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 index 755f8a22..602ecbca 100644 --- 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 index a8fab68a..1833a625 100644 --- 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 index 5adfcb1d..89bdabb2 100644 --- 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-belgium"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=l10n-belgium + - --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: From 68f2d68bc936847ec1f370771262e8c88efda07b Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 27 Oct 2023 20:35:02 +0000 Subject: [PATCH 2/5] [UPD] Update l10n_be_intrastat_product.pot --- .../i18n/l10n_be_intrastat_product.pot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/l10n_be_intrastat_product/i18n/l10n_be_intrastat_product.pot b/l10n_be_intrastat_product/i18n/l10n_be_intrastat_product.pot index fde53ef8..b84f711a 100644 --- a/l10n_be_intrastat_product/i18n/l10n_be_intrastat_product.pot +++ b/l10n_be_intrastat_product/i18n/l10n_be_intrastat_product.pot @@ -295,7 +295,6 @@ msgstr "" #. module: l10n_be_intrastat_product #: model:ir.model.fields,help:l10n_be_intrastat_product.field_l10n_be_intrastat_product_declaration__message_has_error -#: model:ir.model.fields,help:l10n_be_intrastat_product.field_l10n_be_intrastat_product_declaration__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -565,11 +564,6 @@ msgstr "" msgid "Revision" msgstr "" -#. module: l10n_be_intrastat_product -#: model:ir.model.fields,field_description:l10n_be_intrastat_product.field_l10n_be_intrastat_product_declaration__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: l10n_be_intrastat_product #: model_terms:ir.ui.view,arch_db:l10n_be_intrastat_product.l10n_be_intrastat_product_declaration_view_search msgid "Search Belgian Intrastat Product Declaration" From 1ceafa7cd37e3b09d0c7cc1b62e4e18bd9445f16 Mon Sep 17 00:00:00 2001 From: Robin Keunen Date: Fri, 3 Nov 2023 18:00:41 +0100 Subject: [PATCH 3/5] fix precommit --- .../data/intrastat_region.xml | 14 +-- .../data/intrastat_transaction.xml | 118 +++++++++--------- .../security/intrastat_security.xml | 6 +- l10n_be_partner_kbo_bce/demo/res_partner.xml | 30 +++-- .../views/report_vatintraprint.xml | 4 +- 5 files changed, 79 insertions(+), 93 deletions(-) diff --git a/l10n_be_intrastat_product/data/intrastat_region.xml b/l10n_be_intrastat_product/data/intrastat_region.xml index 07c0665b..d63c69b6 100644 --- a/l10n_be_intrastat_product/data/intrastat_region.xml +++ b/l10n_be_intrastat_product/data/intrastat_region.xml @@ -1,22 +1,20 @@ - - - + 1 Flemish region Includes Antwerp, Flemish Brabant, West Flanders, East Flanders and Limburg provinces + name="description" + >Includes Antwerp, Flemish Brabant, West Flanders, East Flanders and Limburg provinces 2 Walloon region Includes Walloon Brabant, Hainaut, Liège, Luxembourg and Namur provinces + name="description" + >Includes Walloon Brabant, Hainaut, Liège, Luxembourg and Namur provinces 3 @@ -24,6 +22,4 @@ Includes 19 districts - - diff --git a/l10n_be_intrastat_product/data/intrastat_transaction.xml b/l10n_be_intrastat_product/data/intrastat_transaction.xml index 2a3bc498..40106eed 100644 --- a/l10n_be_intrastat_product/data/intrastat_transaction.xml +++ b/l10n_be_intrastat_product/data/intrastat_transaction.xml @@ -1,187 +1,183 @@ - - - + 11 Transactions involving actual change of ownership with financial compensation. Outright sale/purchase except direct trade with/by private consumers. + name="description" + >Transactions involving actual change of ownership with financial compensation. Outright sale/purchase except direct trade with/by private consumers. 12 Transactions involving actual change of ownership with financial compensation. Direct trade with/by private consumers (incl. distance sale). + name="description" + >Transactions involving actual change of ownership with financial compensation. Direct trade with/by private consumers (incl. distance sale). 21 Return and replacement of goods free of charge after registration of the original transaction. Return of goods. + name="description" + >Return and replacement of goods free of charge after registration of the original transaction. Return of goods. 22 Return and replacement of goods free of charge after registration of the original transaction. Replacement for returned goods. + name="description" + >Return and replacement of goods free of charge after registration of the original transaction. Replacement for returned goods. 23 Return and replacement of goods free of charge after registration of the original transaction. Replacement (e.g. under warranty) for goods not being returned. + name="description" + >Return and replacement of goods free of charge after registration of the original transaction. Replacement (e.g. under warranty) for goods not being returned. 31 Transactions involving intended change of ownership or change of ownership without financial compensation. Movements to/from a warehouse (excluding call-off and consignment stock). + name="description" + >Transactions involving intended change of ownership or change of ownership without financial compensation. Movements to/from a warehouse (excluding call-off and consignment stock). 32 Transactions involving intended change of ownership or change of ownership without financial compensation. Supply for sale on approval or after trial (including call-off and consignment stock). + name="description" + >Transactions involving intended change of ownership or change of ownership without financial compensation. Supply for sale on approval or after trial (including call-off and consignment stock). 33 Transactions involving intended change of ownership or change of ownership without financial compensation. Financial leasing. + name="description" + >Transactions involving intended change of ownership or change of ownership without financial compensation. Financial leasing. 34 Transactions involving intended change of ownership or change of ownership without financial compensation. Transactions involving transfer of ownership without financial compensation. + name="description" + >Transactions involving intended change of ownership or change of ownership without financial compensation. Transactions involving transfer of ownership without financial compensation. 41 Transactions with a view to processing under contract (not involving change of ownership). Goods expected to return to the initial Member State/country of export. + name="description" + >Transactions with a view to processing under contract (not involving change of ownership). Goods expected to return to the initial Member State/country of export. 42 Transactions with a view to processing under contract (not involving change of ownership). Goods not expected to return to the initial Member State/country of export. + name="description" + >Transactions with a view to processing under contract (not involving change of ownership). Goods not expected to return to the initial Member State/country of export. 51 Transactions following processing under contract (not involving change of ownership). Goods returning to the initial Member State/country of export. + name="description" + >Transactions following processing under contract (not involving change of ownership). Goods returning to the initial Member State/country of export. 52 Transactions following processing under contract (not involving change of ownership). Goods not returning to the initial Member State/country of export. + name="description" + >Transactions following processing under contract (not involving change of ownership). Goods not returning to the initial Member State/country of export. 60 Operations following repair or maintenance. This service can be both free of charge or against payment. These operations do not involve a (future) transfer of ownership. + name="description" + >Operations following repair or maintenance. This service can be both free of charge or against payment. These operations do not involve a (future) transfer of ownership. 71 Transactions with a view to/following customs clearance (not involving change of ownership, related to goods in quasi-import or export). Release of goods for free circulation in a Member State with a subsequent export to another Member State. + name="description" + >Transactions with a view to/following customs clearance (not involving change of ownership, related to goods in quasi-import or export). Release of goods for free circulation in a Member State with a subsequent export to another Member State. 72 Transactions with a view to/following customs clearance (not involving change of ownership, related to goods in quasi-import or export). Transportation of goods from one Member State to another Member State to place the goods under the export procedure. + name="description" + >Transactions with a view to/following customs clearance (not involving change of ownership, related to goods in quasi-import or export). Transportation of goods from one Member State to another Member State to place the goods under the export procedure. 80 Transactions involving the supply of building materials and technical equipment under a general construction or civil engineering contract for which no separate invoicing of the goods is required and an invoice for the total contract is issued. + name="description" + >Transactions involving the supply of building materials and technical equipment under a general construction or civil engineering contract for which no separate invoicing of the goods is required and an invoice for the total contract is issued. 91 Other transactions which cannot be classified under other codes. Hire, loan, and operational leasing longer than 24 months. + name="description" + >Other transactions which cannot be classified under other codes. Hire, loan, and operational leasing longer than 24 months. 99 Other transactions which cannot be classified under other codes. Other. + name="description" + >Other transactions which cannot be classified under other codes. Other. 1 Transactions involving an actual or intended transfer of ownership from residents to non-residents against financial or other compensation (except the transactions listed under 2, 7 and 8) + name="description" + >Transactions involving an actual or intended transfer of ownership from residents to non-residents against financial or other compensation (except the transactions listed under 2, 7 and 8) 0 2 Return and replacement of goods free of charge after registration of the original transaction + name="description" + >Return and replacement of goods free of charge after registration of the original transaction 0 3 Transactions involving transfer of ownership without financial or in kind compensation (e.g. aid shipments) + name="description" + >Transactions involving transfer of ownership without financial or in kind compensation (e.g. aid shipments) 0 4 Operations with a view to processing 1 under contract (no transfer of ownership to the processor) + name="description" + >Operations with a view to processing 1 under contract (no transfer of ownership to the processor) 0 5 Operations following processing under contract (no transfer of ownership to the processor) + name="description" + >Operations following processing under contract (no transfer of ownership to the processor) 0 6 Operations "following" repair or maintenance, other than under joint inter-governmental production programmes. Repair and maintenance can be against payment or free of charge. These operations do not involve a (future) transfer of ownership*. + name="description" + >Operations "following" repair or maintenance, other than under joint inter-governmental production programmes. Repair and maintenance can be against payment or free of charge. These operations do not involve a (future) transfer of ownership*. 0 7 Operations under joint defence projects or other joint intergovernmental production programmes + name="description" + >Operations under joint defence projects or other joint intergovernmental production programmes 0 8 Transactions involving the supply of building materials and technical equipment under a general construction or civil engineering contract for which no separate invoicing of the goods is required and an invoice for the total contract is issued + name="description" + >Transactions involving the supply of building materials and technical equipment under a general construction or civil engineering contract for which no separate invoicing of the goods is required and an invoice for the total contract is issued 0 9 Other transactions which cannot be classified under other codes + name="description" + >Other transactions which cannot be classified under other codes 0 - - diff --git a/l10n_be_intrastat_product/security/intrastat_security.xml b/l10n_be_intrastat_product/security/intrastat_security.xml index e1378067..5d80e6a1 100644 --- a/l10n_be_intrastat_product/security/intrastat_security.xml +++ b/l10n_be_intrastat_product/security/intrastat_security.xml @@ -1,7 +1,5 @@ - - - + Belgian Intrastat Product Declaration @@ -9,6 +7,4 @@ - - diff --git a/l10n_be_partner_kbo_bce/demo/res_partner.xml b/l10n_be_partner_kbo_bce/demo/res_partner.xml index 59b88e0e..275b79eb 100644 --- a/l10n_be_partner_kbo_bce/demo/res_partner.xml +++ b/l10n_be_partner_kbo_bce/demo/res_partner.xml @@ -1,19 +1,17 @@ - - - Noviat - - 1 - Brussel - 1083 - Rusatiralaan 1 - info@noviat.com - +32 2 808 86 38 - http://www.noviat.com - - + + Noviat + + 1 + Brussel + 1083 + Rusatiralaan 1 + info@noviat.com + +32 2 808 86 38 + http://www.noviat.com + diff --git a/l10n_be_vat_reports/views/report_vatintraprint.xml b/l10n_be_vat_reports/views/report_vatintraprint.xml index c644cf38..29572cb6 100644 --- a/l10n_be_vat_reports/views/report_vatintraprint.xml +++ b/l10n_be_vat_reports/views/report_vatintraprint.xml @@ -43,7 +43,7 @@ @@ -51,7 +51,7 @@

Total:

From a8ba88cdbbdc26a5196e6f552ebd4d818a7d58f3 Mon Sep 17 00:00:00 2001 From: Robin Keunen Date: Fri, 3 Nov 2023 18:09:06 +0100 Subject: [PATCH 4/5] [FIX] companyweb_payment_info: translations --- companyweb_payment_info/i18n/fr.po | 6 +++--- companyweb_payment_info/i18n/nl.po | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/companyweb_payment_info/i18n/fr.po b/companyweb_payment_info/i18n/fr.po index d79b3f92..9eba3801 100644 --- a/companyweb_payment_info/i18n/fr.po +++ b/companyweb_payment_info/i18n/fr.po @@ -66,9 +66,9 @@ msgid "" "%s." msgstr "" "

Companyweb statut de téléchargement

Vous êtes sur le point d'envoyer " -"%s factures ouvertes
to Companyweb pour la société " -"%s.
C'est la première fois que vous utilisez " -"cette fonctionalité pour cette société
Votre login odoo : " +"%s factures ouvertes
to Companyweb pour la société " +"%s.
La dernière période envoyée était %s" +".
Votre login odoo : " "%s recevra un résumé complet à la fin de cette transaction " "
Assurez-vous d'avoir cloturer toutes vos factures pour la période : " "%s." diff --git a/companyweb_payment_info/i18n/nl.po b/companyweb_payment_info/i18n/nl.po index 08b10187..c6152187 100644 --- a/companyweb_payment_info/i18n/nl.po +++ b/companyweb_payment_info/i18n/nl.po @@ -67,8 +67,8 @@ msgid "" msgstr "" "

Companyweb upload

Je staat op het punt je in te dienen %s openstaande factuur
to Companyweb voor het bedrijf %s.
Het is de eerste keer dat u deze functie voor dit " -"bedrijf gebruikt
Uw odoo-login : %s zal aan " +"strong>.
De vorige verzonden periode is %s
" +"Uw odoo-login : %s zal aan " "het einde van deze transactie een volledig samenvatting ontvangen
Zorg " "ervoor dat u uw bankafschriften voor een periode heeft afgesloten " "%s." From 777242337b10048f6dd138a484a505914f46dde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 12 Nov 2023 11:56:07 +0100 Subject: [PATCH 5/5] [FIX] grammar in fr.po --- companyweb_payment_info/i18n/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companyweb_payment_info/i18n/fr.po b/companyweb_payment_info/i18n/fr.po index 9eba3801..d723dcdc 100644 --- a/companyweb_payment_info/i18n/fr.po +++ b/companyweb_payment_info/i18n/fr.po @@ -51,7 +51,7 @@ msgstr "" "%s.
C'est la première fois que vous utilisez " "cette fonctionalité pour cette société
Votre login odoo : " "%s recevra un résumé complet à la fin de cette transaction " -"
Assurez-vous d'avoir cloturer toutes vos factures pour la période : " +"
Assurez-vous d'avoir cloturé toutes vos factures pour la période : " "%s." #. module: companyweb_payment_info @@ -70,7 +70,7 @@ msgstr "" "%s.
La dernière période envoyée était %s" ".
Votre login odoo : " "%s recevra un résumé complet à la fin de cette transaction " -"
Assurez-vous d'avoir cloturer toutes vos factures pour la période : " +"
Assurez-vous d'avoir cloturé toutes vos factures pour la période : " "%s." #. module: companyweb_payment_info