diff --git a/.copier-answers.yml b/.copier-answers.yml
index f558fac56c4..eb9cb0674ea 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: This project focus on payment interface
repo_name: OCA banking payment addons for Odoo
repo_slug: bank-payment
repo_website: https://github.com/OCA/bank-payment
-travis_apt_packages: []
-travis_apt_sources: []
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 9429bc688aa..fed88d70d23 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 755f8a22517..602ecbca24d 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 215b84b0f85..326c1255676 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 3185533505b..117103b0373 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/bank-payment"]
+ - id: oca-gen-addon-readme
+ args:
+ - --addons-dir=.
+ - --branch=14.0
+ - --org-name=OCA
+ - --repo-name=bank-payment
+ - --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_banking_mandate/i18n/account_banking_mandate.pot b/account_banking_mandate/i18n/account_banking_mandate.pot
index 468fe16c898..093e002b433 100644
--- a/account_banking_mandate/i18n/account_banking_mandate.pot
+++ b/account_banking_mandate/i18n/account_banking_mandate.pot
@@ -93,7 +93,6 @@ msgstr ""
#. module: account_banking_mandate
#: model_terms:ir.ui.view,arch_db:account_banking_mandate.view_mandate_form
-#: model_terms:ir.ui.view,arch_db:account_banking_mandate.view_mandate_tree
msgid "Banking Mandate"
msgstr ""
@@ -286,7 +285,6 @@ msgstr ""
#. module: account_banking_mandate
#: model:ir.model.fields,help:account_banking_mandate.field_account_banking_mandate__message_has_error
-#: model:ir.model.fields,help:account_banking_mandate.field_account_banking_mandate__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -495,11 +493,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""
-#. module: account_banking_mandate
-#: model:ir.model.fields,field_description:account_banking_mandate.field_account_banking_mandate__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
#. module: account_banking_mandate
#: model:ir.model.fields,field_description:account_banking_mandate.field_account_banking_mandate__scan
msgid "Scan of the Mandate"
diff --git a/account_banking_mandate/views/account_banking_mandate_view.xml b/account_banking_mandate/views/account_banking_mandate_view.xml
index c31374da433..820808a21de 100644
--- a/account_banking_mandate/views/account_banking_mandate_view.xml
+++ b/account_banking_mandate/views/account_banking_mandate_view.xml
@@ -114,7 +114,7 @@
view.mandate.tree
account.banking.mandate
-
+
-
-
+
SEPA Direct Debit of customers
@@ -14,9 +13,9 @@
+ name="partner_bank_id"
+ ref="account_payment_mode.res_partner_12_iban"
+ />
sepa
recurrent
first
@@ -25,16 +24,16 @@
+ name="customer_payment_mode_id"
+ ref="payment_mode_inbound_sepa_dd1"
+ />
+ name="partner_bank_id"
+ ref="account_payment_mode.res_partner_2_iban"
+ />
sepa
recurrent
first
@@ -43,9 +42,8 @@
+ name="customer_payment_mode_id"
+ ref="payment_mode_inbound_sepa_dd1"
+ />
-
diff --git a/account_payment_order/i18n/account_payment_order.pot b/account_payment_order/i18n/account_payment_order.pot
index b92beaff557..1820f293a1e 100644
--- a/account_payment_order/i18n/account_payment_order.pot
+++ b/account_payment_order/i18n/account_payment_order.pot
@@ -532,7 +532,6 @@ msgstr ""
#. module: account_payment_order
#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_error
-#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -882,7 +881,6 @@ msgstr ""
#: model:ir.actions.act_window,name:account_payment_order.account_payment_line_action
#: model:ir.model,name:account_payment_order.model_account_payment_line
#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_form
-#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_tree
msgid "Payment Lines"
msgstr ""
@@ -938,7 +936,6 @@ msgstr ""
#: model:ir.ui.menu,name:account_payment_order.account_payment_order_outbound_menu
#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_graph
#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_pivot
-#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_tree
msgid "Payment Orders"
msgstr ""
@@ -987,11 +984,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""
-#. module: account_payment_order
-#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
#. module: account_payment_order
#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_line_create__payment_mode__same
#: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_mode__default_payment_mode__same
diff --git a/account_payment_order/views/account_payment_line.xml b/account_payment_order/views/account_payment_line.xml
index d9d308c761c..1c2c72a065f 100644
--- a/account_payment_order/views/account_payment_line.xml
+++ b/account_payment_order/views/account_payment_line.xml
@@ -51,7 +51,7 @@
account.payment.line.tree
account.payment.line
-
+
account.payment.order.tree
account.payment.order
-
+
diff --git a/account_payment_order_notification/i18n/account_payment_order_notification.pot b/account_payment_order_notification/i18n/account_payment_order_notification.pot
index f630345d77b..32a5be09e81 100644
--- a/account_payment_order_notification/i18n/account_payment_order_notification.pot
+++ b/account_payment_order_notification/i18n/account_payment_order_notification.pot
@@ -157,7 +157,6 @@ msgstr ""
#. module: account_payment_order_notification
#: model:ir.model.fields,help:account_payment_order_notification.field_account_payment_order_notification__message_has_error
-#: model:ir.model.fields,help:account_payment_order_notification.field_account_payment_order_notification__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -287,11 +286,6 @@ msgstr ""
msgid "Payment Order Notifications"
msgstr ""
-#. module: account_payment_order_notification
-#: model:ir.model.fields,field_description:account_payment_order_notification.field_account_payment_order_notification__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
#. module: account_payment_order_notification
#: model_terms:ir.ui.view,arch_db:account_payment_order_notification.account_payment_order_form
msgid "Send mails"
diff --git a/account_payment_order_tier_validation/i18n/account_payment_order_tier_validation.pot b/account_payment_order_tier_validation/i18n/account_payment_order_tier_validation.pot
index ec5a3eb6372..88114c69de9 100644
--- a/account_payment_order_tier_validation/i18n/account_payment_order_tier_validation.pot
+++ b/account_payment_order_tier_validation/i18n/account_payment_order_tier_validation.pot
@@ -107,6 +107,11 @@ msgstr ""
msgid "Validated Message"
msgstr ""
+#. module: account_payment_order_tier_validation
+#: model:ir.model.fields,field_description:account_payment_order_tier_validation.field_account_payment_order__validation_status
+msgid "Validation Status"
+msgstr ""
+
#. module: account_payment_order_tier_validation
#: model:ir.model.fields,field_description:account_payment_order_tier_validation.field_account_payment_order__review_ids
msgid "Validations"