Skip to content

Commit

Permalink
Merge PR #634 into 15.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Oct 28, 2023
2 parents 22a83a3 + df17c14 commit e76f12c
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 30 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: git+https://github.com/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: 15.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand All @@ -20,6 +20,4 @@ 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: []

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.8-odoo15.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.8-ocb15.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
18 changes: 16 additions & 2 deletions .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: dfba427ba03900b69e0a7f2c65890dc48921d36a
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-statement-import"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=15.0
- --org-name=OCA
- --repo-name=bank-statement-import
- --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 Expand Up @@ -125,7 +139,7 @@ repos:
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
rev: 7.0.5
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ msgstr ""

#. module: account_statement_import_online
#: model:ir.model.fields,help:account_statement_import_online.field_online_bank_statement_provider__message_has_error
#: model:ir.model.fields,help:account_statement_import_online.field_online_bank_statement_provider__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -378,11 +377,6 @@ msgstr ""
msgid "Pull Online Bank Statements"
msgstr ""

#. module: account_statement_import_online
#: model:ir.model.fields,field_description:account_statement_import_online.field_online_bank_statement_provider__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: account_statement_import_online
#: model:ir.model.fields,field_description:account_statement_import_online.field_online_bank_statement_provider__account_number
msgid "Sanitized Account Number"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ msgstr ""
#: code:addons/account_statement_import_online_ponto/models/online_bank_statement_provider_ponto.py:0
#, python-format
msgid ""
"Error during Create Synchronisation {} \n"
"Error during Create Synchronization %(code)s \n"
"\n"
" {}"
" %(text)s"
msgstr ""

#. module: account_statement_import_online_ponto
Expand All @@ -28,9 +28,9 @@ msgstr ""
msgid ""
"Error during get transaction.\n"
"\n"
"{} \n"
"%(code)s\n"
"\n"
" {}"
"%(text)s"
msgstr ""

#. module: account_statement_import_online_ponto
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ def _ponto_header(self):
)
self.sudo().ponto_token_expiration = expiration_date
else:
raise UserError(
_("{} \n\n {}").format(response.status_code, response.text)
)
raise UserError(f"{response.status_code}\n\n {response.text}")
return {
"Accept": "application/json",
"Authorization": "Bearer %s" % self.ponto_token,
Expand All @@ -105,7 +103,7 @@ def _ponto_get_account_ids(self):
)
res[iban] = account.get("id")
return res
raise UserError(_("{} \n\n {}").format(response.status_code, response.text))
raise UserError(f"{response.status_code}\n\n {response.text}")

def _ponto_synchronisation(self, account_id):
url = PONTO_ENDPOINT + "/synchronizations"
Expand All @@ -125,9 +123,11 @@ def _ponto_synchronisation(self, account_id):
sync_id = data.get("attributes", {}).get("resourceId", False)
else:
raise UserError(
_("Error during Create Synchronisation {} \n\n {}").format(
response.status_code, response.text
)
_("Error during Create Synchronization %(code)s \n\n %(text)s")
% {
"code": response.status_code,
"text": response.text,
}
)

# Check synchronisation
Expand Down Expand Up @@ -161,9 +161,11 @@ def _ponto_get_transaction(self, account_id, date_since, date_until):
)
if response.status_code != 200:
raise UserError(
_("Error during get transaction.\n\n{} \n\n {}").format(
response.status_code, response.text
)
_("Error during get transaction.\n\n%(code)s\n\n%(text)s")
% {
"code": response.status_code,
"text": response.text,
}
)
if params.get("before"):
params.pop("before")
Expand Down

0 comments on commit e76f12c

Please sign in to comment.