Skip to content

Commit

Permalink
Merge pull request #1041 from OCA/14.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/bank-payment (14.0)
  • Loading branch information
bt-admin authored Oct 29, 2023
2 parents 2dc0376 + 44bb3ab commit 8c2dc7b
Show file tree
Hide file tree
Showing 17 changed files with 55 additions and 52 deletions.
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -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: {}
Expand All @@ -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
Expand All @@ -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: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 15 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
7 changes: 0 additions & 7 deletions account_banking_mandate/i18n/account_banking_mandate.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<field name="name">view.mandate.tree</field>
<field name="model">account.banking.mandate</field>
<field name="arch" type="xml">
<tree string="Banking Mandate">
<tree>
<field name="id" invisible="1" />
<field name="unique_mandate_reference" string="Reference" />
<field
Expand Down
1 change: 0 additions & 1 deletion account_banking_pain_base/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ msgstr ""
#, fuzzy, python-format
msgid "Payment Line has reference '%s'."
msgstr ""
"Das '%s' der Zahlungszeile kann nicht mit der Referenz '%s'berechnet werden."

#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_account_payment_line
Expand Down
1 change: 0 additions & 1 deletion account_banking_pain_base/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,6 @@ msgstr ""
#, fuzzy, python-format
msgid "Payment Line has reference '%s'."
msgstr ""
"No se puede procesar el campo '%s' de la línea de pago con referencia '%s'."

#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_account_payment_line
Expand Down
1 change: 0 additions & 1 deletion account_banking_pain_base/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@ msgstr ""
#, fuzzy, python-format
msgid "Payment Line has reference '%s'."
msgstr ""
"Non è possibile calcolare '%s' della linea di pagamento con riferimento '%s'."

#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_account_payment_line
Expand Down
2 changes: 1 addition & 1 deletion account_banking_pain_base/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ msgstr ""
#: code:addons/account_banking_pain_base/models/account_payment_order.py:0
#, fuzzy, python-format
msgid "Payment Line has reference '%s'."
msgstr "Kan de '%s' niet berekenen van de betaalregel met referentie '%s'."
msgstr ""

#. module: account_banking_pain_base
#: model:ir.model,name:account_banking_pain_base.model_account_payment_line
Expand Down
28 changes: 13 additions & 15 deletions account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<odoo noupdate="1">
<record id="payment_mode_inbound_sepa_dd1" model="account.payment.mode">
<field name="name">SEPA Direct Debit of customers</field>
<field name="company_id" ref="base.main_company" />
Expand All @@ -14,9 +13,9 @@
<!-- Azure Interior -->
<record id="res_partner_12_mandate" model="account.banking.mandate">
<field
name="partner_bank_id"
ref="account_payment_mode.res_partner_12_iban"
/>
name="partner_bank_id"
ref="account_payment_mode.res_partner_12_iban"
/>
<field name="format">sepa</field>
<field name="type">recurrent</field>
<field name="recurrent_sequence_type">first</field>
Expand All @@ -25,16 +24,16 @@
</record>
<record id="base.res_partner_12" model="res.partner">
<field
name="customer_payment_mode_id"
ref="payment_mode_inbound_sepa_dd1"
/>
name="customer_payment_mode_id"
ref="payment_mode_inbound_sepa_dd1"
/>
</record>
<!-- Deco Addict -->
<record id="res_partner_2_mandate" model="account.banking.mandate">
<field
name="partner_bank_id"
ref="account_payment_mode.res_partner_2_iban"
/>
name="partner_bank_id"
ref="account_payment_mode.res_partner_2_iban"
/>
<field name="format">sepa</field>
<field name="type">recurrent</field>
<field name="recurrent_sequence_type">first</field>
Expand All @@ -43,9 +42,8 @@
</record>
<record id="base.res_partner_2" model="res.partner">
<field
name="customer_payment_mode_id"
ref="payment_mode_inbound_sepa_dd1"
/>
name="customer_payment_mode_id"
ref="payment_mode_inbound_sepa_dd1"
/>
</record>
</data>
</odoo>
8 changes: 0 additions & 8 deletions account_payment_order/i18n/account_payment_order.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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 ""

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion account_payment_order/views/account_payment_line.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<field name="name">account.payment.line.tree</field>
<field name="model">account.payment.line</field>
<field name="arch" type="xml">
<tree string="Payment Lines">
<tree>
<field
name="order_id"
invisible="not context.get('account_payment_line_main_view')"
Expand Down
2 changes: 1 addition & 1 deletion account_payment_order/views/account_payment_order.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<field name="name">account.payment.order.tree</field>
<field name="model">account.payment.order</field>
<field name="arch" type="xml">
<tree string="Payment Orders">
<tree>
<field name="name" decoration-bf="1" />
<field name="payment_mode_id" />
<field name="journal_id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8c2dc7b

Please sign in to comment.