Skip to content

Commit

Permalink
Merge branch 'OCA:14.0' into 14.0-mig-account_statement_import_online…
Browse files Browse the repository at this point in the history
…_wise
  • Loading branch information
davidwul authored Feb 8, 2024
2 parents 92c6948 + 13fcbc5 commit 3f1cfa1
Show file tree
Hide file tree
Showing 37 changed files with 118 additions and 113 deletions.
9 changes: 5 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.20
_src_path: git+https://github.com/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: {}
Expand All @@ -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
Expand All @@ -20,6 +21,6 @@ repo_description: This repository hosts additionnal parsers and import features
repo_name: OCA bank statement import modules for Odoo
repo_slug: bank-statement-import
repo_website: https://github.com/OCA/bank-statement-import
travis_apt_packages: []
travis_apt_sources: []
use_pyproject_toml: false
use_ruff: false

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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache

# C extensions
*.so
Expand Down
23 changes: 20 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -33,14 +37,27 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
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-statement-import"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=bank-statement-import
- --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
rev: v1.5.3
hooks:
- id: autoflake
args:
Expand Down Expand Up @@ -119,7 +136,7 @@ repos:
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
rev: 5.0.0
hooks:
- id: flake8
name: flake8
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[account_statement_import](account_statement_import/) | 14.0.3.3.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Import Statement Files
[account_statement_import](account_statement_import/) | 14.0.3.3.2 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Import Statement Files
[account_statement_import_base](account_statement_import_base/) | 14.0.1.0.0 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Base module for Bank Statement Import
[account_statement_import_camt](account_statement_import_camt/) | 14.0.1.2.1 | | CAMT Format Bank Statements Import
[account_statement_import_camt54](account_statement_import_camt54/) | 14.0.1.1.0 | | Bank Account Camt54 Import
Expand Down
2 changes: 1 addition & 1 deletion account_statement_import/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Import Statement Files
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:892584d9edffc0166335bf92634566cbf1b4c90d44b0bae10e158ba2fce290c2
!! source digest: sha256:bde27841df5c67349c34e55f7a214d4d0819c77b5dc0fc7c99994168aa3dd84e
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
Expand Down
2 changes: 1 addition & 1 deletion account_statement_import/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"name": "Import Statement Files",
"category": "Accounting",
"version": "14.0.3.3.1",
"version": "14.0.3.3.2",
"license": "LGPL-3",
"depends": ["account_statement_import_base"],
"author": "Odoo SA, Akretion, Odoo Community Association (OCA)",
Expand Down
2 changes: 0 additions & 2 deletions account_statement_import/demo/partner_bank.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
Licence LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0).
-->
<odoo>
<data>

<record id="ofx_partner_bank_1" model="res.partner.bank">
<field name="acc_number">BE02631118262640</field>
Expand All @@ -31,5 +30,4 @@
<field name="bank_id" ref="base.res_bank_1" />
</record>

</data>
</odoo>
6 changes: 3 additions & 3 deletions account_statement_import/i18n/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "الحساب في كشف الحساب البنكي (%s) مختلف عن حساب دفتر اليومية (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "الحساب في كشف الحساب البنكي مختلف عن حساب دفتر اليومية (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -213,7 +213,7 @@ msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr ""
"العملة في كشف الحساب البنكي (%s) مختلفة عن العملة في دفتر اليومية (%s)."
"العملة في كشف الحساب البنكي (%s) مختلفة عن العملة في دفتر اليومية '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr ""
"Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen (%s)."
"Kontoen for dette bank kontoudtog er ikke den samme som journalen (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -206,7 +206,7 @@ msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr ""
"Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen (%s)."
"Kontoen for dette bank kontoudtog (%s) er ikke den samme som journalen '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr ""
"Das Konto dieses Kontoauszugs (%s) ist nicht das Gleiche, wie das im Journal "
"Das Konto dieses Kontoauszugs ist nicht das Gleiche, wie das im Journal "
"(%s)."

#. module: account_statement_import
Expand Down Expand Up @@ -210,7 +210,7 @@ msgid ""
"the journal '%s' (%s)."
msgstr ""
"Die Währung des Kontoauszugs (%s) entspricht nicht der Währung des Journals "
"(%s)."
"'%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/et.po
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr ""
"Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus (%s)."
"Selle pangaväljavõtte pangakonto ei ole sama, mis on andmikus (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -206,7 +206,7 @@ msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr ""
"Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus (%s)."
"Selle pangaväljavõtte pangakonto (%s) ei ole sama, mis on andmikus '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "Tiiotteen tili (%s) ei vastaa päiväkirjaa (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "Tiiotteen tili ei vastaa päiväkirjaa (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -203,7 +203,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "Tiiotteen tili (%s) ei vastaa päiväkirjaa (%s)."
msgstr "Tiiotteen tili (%s) ei vastaa päiväkirjaa '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "מספר החשבון של שורת חשבון זו אינו זהה לזה שביומן (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -206,7 +206,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן (%s)."
msgstr "מספר החשבון של שורת חשבון זו (%s) אינו זהה לזה שביומן '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "Žiro račun ovog izvoda banke nije jednak dnevniku (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -211,7 +211,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku (%s)."
msgstr "Žiro račun ovog izvoda banke (%s) nije jednak dnevniku '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "Ennek a bankkivonatnak a számlája nem egyezik a naplójéval (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -204,7 +204,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval (%s)."
msgstr "Ennek a bankkivonatnak (%s) a számlája nem egyezik a naplójéval '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/ko.po
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "이 명세서의 계정(%s)이 분개장(%s)과 동일하지 않습니다."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "이 명세서의 계정(%s)이 분개장과 동일하지 않습니다."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -202,7 +202,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "이 명세서의 계정(%s)이 분개장(%s)과 동일하지 않습니다."
msgstr "이 명세서의 계정(%s)이 분개장 '%s' (%s)과 동일하지 않습니다."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
6 changes: 3 additions & 3 deletions account_statement_import/i18n/lt.po
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ msgstr ""
#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
#, fuzzy, python-format
msgid "The Bank Accounting Account in not set on the journal '%s'."
msgstr "Šio išrašo sąskaita (%s) nėra tokia pati, kaip žurnalo (%s)."
msgid "The Bank Accounting Account is not set on the journal '%s'."
msgstr "Šio išrašo sąskaita nėra tokia pati, kaip žurnalo (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand All @@ -209,7 +209,7 @@ msgstr ""
msgid ""
"The currency of the bank statement (%s) is not the same as the currency of "
"the journal '%s' (%s)."
msgstr "Banko išrašo valiuta (%s) nėra tokia pati, kaip žurnalo valiuta (%s)."
msgstr "Banko išrašo valiuta (%s) nėra tokia pati, kaip žurnalo valiuta '%s' (%s)."

#. module: account_statement_import
#: code:addons/account_statement_import/wizard/account_statement_import.py:0
Expand Down
Loading

0 comments on commit 3f1cfa1

Please sign in to comment.