From a1960a4c80345a0b4237f984d35086e1cbdb3539 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 18:17:39 +0200 Subject: [PATCH 01/11] [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 e18ad489..b8ac567c 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 @@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.' repo_name: account-reconcile repo_slug: account-reconcile repo_website: https://github.com/OCA/account-reconcile -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 215b84b0..326c1255 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 bb95b84a..8c78ab23 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/account-reconcile"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=account-reconcile + - --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 fc791d7543ca24a34c8dec7d98a0707b2f758201 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 27 Oct 2023 16:22:07 +0000 Subject: [PATCH 02/11] [UPD] Update account_mass_reconcile.pot --- account_mass_reconcile/i18n/account_mass_reconcile.pot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/account_mass_reconcile/i18n/account_mass_reconcile.pot b/account_mass_reconcile/i18n/account_mass_reconcile.pot index 00c43e2e..10fc6b7e 100644 --- a/account_mass_reconcile/i18n/account_mass_reconcile.pot +++ b/account_mass_reconcile/i18n/account_mass_reconcile.pot @@ -327,7 +327,6 @@ msgstr "" #. module: account_mass_reconcile #: model:ir.model.fields,help:account_mass_reconcile.field_account_mass_reconcile__message_has_error -#: model:ir.model.fields,help:account_mass_reconcile.field_account_mass_reconcile__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -600,11 +599,6 @@ msgstr "" msgid "Run date" msgstr "" -#. module: account_mass_reconcile -#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: account_mass_reconcile #: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method__sequence msgid "Sequence" From dd247d3821fc7e5318ee909675812d79cbbf5300 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Fri, 27 Oct 2023 16:22:10 +0000 Subject: [PATCH 03/11] [UPD] Update account_move_base_import.pot --- .../i18n/account_move_base_import.pot | 8 -------- 1 file changed, 8 deletions(-) diff --git a/account_move_base_import/i18n/account_move_base_import.pot b/account_move_base_import/i18n/account_move_base_import.pot index 0cb382a4..7128924b 100644 --- a/account_move_base_import/i18n/account_move_base_import.pot +++ b/account_move_base_import/i18n/account_move_base_import.pot @@ -279,9 +279,7 @@ msgstr "" #. module: account_move_base_import #: model:ir.model.fields,help:account_move_base_import.field_account_journal__message_has_error -#: model:ir.model.fields,help:account_move_base_import.field_account_journal__message_has_sms_error #: model:ir.model.fields,help:account_move_base_import.field_account_move__message_has_error -#: model:ir.model.fields,help:account_move_base_import.field_account_move__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -582,12 +580,6 @@ msgstr "" msgid "Related journals" msgstr "" -#. module: account_move_base_import -#: model:ir.model.fields,field_description:account_move_base_import.field_account_journal__message_has_sms_error -#: model:ir.model.fields,field_description:account_move_base_import.field_account_move__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: account_move_base_import #: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__sequence msgid "Sequence" From ebc52337771d0527297f8016b7c88ff09d126c16 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Fri, 27 Oct 2023 23:24:09 +0200 Subject: [PATCH 04/11] [FIX] account_mass_reconcile: black, isort, prettier --- account_mass_reconcile/views/mass_reconcile.xml | 6 +++--- .../views/mass_reconcile_history_view.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/account_mass_reconcile/views/mass_reconcile.xml b/account_mass_reconcile/views/mass_reconcile.xml index 7a39e161..3067197c 100644 --- a/account_mass_reconcile/views/mass_reconcile.xml +++ b/account_mass_reconcile/views/mass_reconcile.xml @@ -50,7 +50,7 @@ - + - - - - -
-
- - to check -
-
- - - -
+ + account.journal.inherit.dashboard.kanban + account.journal + + + + + + + + + +
+
+ + to check
- - - - - +
+ + + +
+
+ + + + diff --git a/account_reconciliation_widget/views/account_view.xml b/account_reconciliation_widget/views/account_view.xml index 2b1f8dab..e1f7e177 100644 --- a/account_reconciliation_widget/views/account_view.xml +++ b/account_reconciliation_widget/views/account_view.xml @@ -1,30 +1,28 @@ - - - Reconciliation on Bank Statements - account.bank.statement.line - bank_statement_reconciliation_view - + + Reconciliation on Bank Statements + account.bank.statement.line + bank_statement_reconciliation_view + - - Reconcile - manual_reconciliation_view - - action - list - + + Reconcile + manual_reconciliation_view + + action + list + - - Reconciliation - manual_reconciliation_view - + + Reconciliation + manual_reconciliation_view + - - + From b2d4cc819cb960ab7775d8b6877a53a70042896a Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Fri, 27 Oct 2023 23:25:02 +0200 Subject: [PATCH 07/11] [FIX] account_reconciliation_widget_limit_aml: black, isort, prettier --- .../views/res_config_settings_views.xml | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/account_reconciliation_widget_limit_aml/views/res_config_settings_views.xml b/account_reconciliation_widget_limit_aml/views/res_config_settings_views.xml index 00a12c0a..473d01d9 100644 --- a/account_reconciliation_widget_limit_aml/views/res_config_settings_views.xml +++ b/account_reconciliation_widget_limit_aml/views/res_config_settings_views.xml @@ -4,23 +4,21 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> - - - res.config.settings - - - -
- - - - - + + res.config.settings + + + +
+ + + + From 5ca686732dc59cea2afb16f928ca0f9ad701bae8 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Fri, 27 Oct 2023 23:25:26 +0200 Subject: [PATCH 08/11] [FIX] account_reconcile_restrict_partner_mismatch: black, isort, prettier --- .../report/account_move_lines_report.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml b/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml index ee82bcc8..a464bed1 100644 --- a/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml +++ b/account_reconcile_restrict_partner_mismatch/report/account_move_lines_report.xml @@ -4,12 +4,7 @@ Reconciled items with partner mismatch account.reconcile.partner.mismatch.report - + From dfd6598a0abcecb01739763a8482f49de7b36a71 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 00:05:44 +0000 Subject: [PATCH 09/11] [UPD] Update account_mass_reconcile.pot --- account_mass_reconcile/i18n/account_mass_reconcile.pot | 8 -------- 1 file changed, 8 deletions(-) diff --git a/account_mass_reconcile/i18n/account_mass_reconcile.pot b/account_mass_reconcile/i18n/account_mass_reconcile.pot index 10fc6b7e..ff572c42 100644 --- a/account_mass_reconcile/i18n/account_mass_reconcile.pot +++ b/account_mass_reconcile/i18n/account_mass_reconcile.pot @@ -101,23 +101,15 @@ msgstr "" #. module: account_mass_reconcile #: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form -#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_tree msgid "Automatic Mass Reconcile" msgstr "" #. module: account_mass_reconcile -#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form #: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_form -#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_tree #: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search msgid "Automatic Mass Reconcile History" msgstr "" -#. module: account_mass_reconcile -#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_method_tree -msgid "Automatic Mass Reconcile Method" -msgstr "" - #. module: account_mass_reconcile #: code:addons/account_mass_reconcile/models/base_reconciliation.py:0 #, python-format From b141f2cfacc4b6fe6e03d6cf0fbc442831fc9391 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 00:05:48 +0000 Subject: [PATCH 10/11] [UPD] Update account_move_base_import.pot --- account_move_base_import/i18n/account_move_base_import.pot | 1 - 1 file changed, 1 deletion(-) diff --git a/account_move_base_import/i18n/account_move_base_import.pot b/account_move_base_import/i18n/account_move_base_import.pot index 7128924b..86265b5d 100644 --- a/account_move_base_import/i18n/account_move_base_import.pot +++ b/account_move_base_import/i18n/account_move_base_import.pot @@ -480,7 +480,6 @@ msgstr "" #. module: account_move_base_import #: model:ir.ui.menu,name:account_move_base_import.menu_action_move_completion_rule_tree_menu #: model_terms:ir.ui.view,arch_db:account_move_base_import.move_completion_rule_view_form -#: model_terms:ir.ui.view,arch_db:account_move_base_import.move_completion_rule_view_tree msgid "Move Completion Rule" msgstr "" From b1fcb0ca9e984fedfbfde8fb8db0d5f0e3aa6068 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Sat, 28 Oct 2023 00:05:50 +0000 Subject: [PATCH 11/11] [UPD] Update account_reconcile_restrict_partner_mismatch.pot --- .../i18n/account_reconcile_restrict_partner_mismatch.pot | 1 - 1 file changed, 1 deletion(-) diff --git a/account_reconcile_restrict_partner_mismatch/i18n/account_reconcile_restrict_partner_mismatch.pot b/account_reconcile_restrict_partner_mismatch/i18n/account_reconcile_restrict_partner_mismatch.pot index ca4f4954..2b4698a8 100644 --- a/account_reconcile_restrict_partner_mismatch/i18n/account_reconcile_restrict_partner_mismatch.pot +++ b/account_reconcile_restrict_partner_mismatch/i18n/account_reconcile_restrict_partner_mismatch.pot @@ -95,7 +95,6 @@ msgstr "" #: model:ir.actions.act_window,name:account_reconcile_restrict_partner_mismatch.action_account_reconcile_partner_mismatch_report #: model:ir.ui.menu,name:account_reconcile_restrict_partner_mismatch.menu_account_reconcile_partner_mismatch_report #: model_terms:ir.ui.view,arch_db:account_reconcile_restrict_partner_mismatch.account_reconcile_partner_mismatch_report_view_form -#: model_terms:ir.ui.view,arch_db:account_reconcile_restrict_partner_mismatch.view_account_move_reconciled_report_tree msgid "Reconciled items with partner mismatch" msgstr ""