Merge pull request #119 from Noviat/18-imp-add-pain-state

Syncing from upstream Noviat/account_ebics (18-imp-add-pain-state)
This commit is contained in:
braintec authored and GitHub committed 2026-10-26 01:16:44 +01:00
commit 1b285865f4
45 files changed
+337 -216

No files matched your search

+2 -1
View File
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v5.0 _commit: v8.0.2
_src_path: git@github.com:Noviat-CI/addons-repo-template.git _src_path: git@github.com:Noviat-CI/addons-repo-template.git
ci_disable_autoinstall_modules: account_asset ci_disable_autoinstall_modules: account_asset
odoo_test_flavor: Both odoo_test_flavor: Both
@@ -9,4 +9,5 @@ rebel_module_groups: []
repo_name: Modules dedicated to manage the EBICS protocol repo_name: Modules dedicated to manage the EBICS protocol
repo_slug: account_ebics repo_slug: account_ebics
repo_type: customer repo_type: customer
weblate_project_name: ''
+29
View File
@@ -0,0 +1,29 @@
name: Check module version bump
on:
pull_request:
branches:
- "18.0*"
jobs:
check-version-bump:
runs-on: ubuntu-latest
name: Check module version bump
steps:
- uses: actions/checkout@v7
with:
# HEAD is the PR merge commit, HEAD^1 the tip of the base branch
fetch-depth: 2
persist-credentials: false
- name: Configure git authentication
# Header instead of URL credentials, see test.yml
env:
TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: |
git config --global http.https://github.com/.extraheader "AUTHORIZATION: basic $(printf 'x-access-token:%s' "$TOKEN" | base64 -w0)"
- name: Add Noviat CI Tools to PATH
run: |
git clone https://github.com/Noviat-CI/noviat-ci-tools.git /opt/noviat-ci-tools
echo "/opt/noviat-ci-tools" >> $GITHUB_PATH
- name: Check module version bump
run: check_module_version_bump
+10 -4
View File
@@ -8,17 +8,23 @@ on:
branches: branches:
- "18.0" - "18.0"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
pre-commit: pre-commit:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- uses: actions/setup-python@v5 - uses: actions/setup-python@v7
with: with:
python-version: "3.11" python-version: "3.11"
cache: 'pip'
cache-dependency-path: '.pre-commit-config.yaml'
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: ~/.cache/pre-commit path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+42 -13
View File
@@ -8,18 +8,23 @@ on:
branches: branches:
- "18.0" - "18.0"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
unreleased-deps: unreleased-deps:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Detect unreleased dependencies name: Detect unreleased dependencies
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
- run: | - run: |
for reqfile in requirements.txt test-requirements.txt ; do for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then if [ -f ${reqfile} ] ; then
result=0 result=0
# reject non-comment lines that contain a / (i.e. URLs, relative paths) # reject non-comment lines that contain a / (i.e. URLs, relative paths)
grep "^[^#].*/" ${reqfile} || result=$? # unless they have a "# SKIP TEST" comment
grep "^[^#].*/" ${reqfile} | grep -v "# SKIP TEST" || result=$?
if [ $result -eq 0 ] ; then if [ $result -eq 0 ] ; then
echo "Unreleased dependencies found in ${reqfile}." echo "Unreleased dependencies found in ${reqfile}."
exit 1 exit 1
@@ -27,7 +32,7 @@ jobs:
fi fi
done done
test: test:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
container: ${{ matrix.container }} container: ${{ matrix.container }}
name: ${{ matrix.name }} name: ${{ matrix.name }}
permissions: permissions:
@@ -49,7 +54,7 @@ jobs:
makepot: "true" makepot: "true"
services: services:
postgres: postgres:
image: postgres:12.0 image: postgres:12
env: env:
POSTGRES_USER: odoo POSTGRES_USER: odoo
POSTGRES_PASSWORD: odoo POSTGRES_PASSWORD: odoo
@@ -60,20 +65,34 @@ jobs:
INSTALL_ADDONS_DIR: "/tmp/addons-merged" INSTALL_ADDONS_DIR: "/tmp/addons-merged"
ADDITIONAL_ADDONS_DIR: "/tmp/additional-addons" ADDITIONAL_ADDONS_DIR: "/tmp/additional-addons"
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
with: with:
persist-credentials: false persist-credentials: false
- name: Configure git authentication
env:
TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: |
git config --global http.https://github.com/.extraheader "AUTHORIZATION: basic $(printf 'x-access-token:%s' "$TOKEN" | base64 -w0)"
- name: Set pip constraints (pyOpenSSL / cryptography)
run: |
cat > /tmp/constraints.txt <<'EOF'
pyOpenSSL == 22.1.0
cryptography == 38.0.4
EOF
echo "PIP_CONSTRAINT=/tmp/constraints.txt" >> $GITHUB_ENV
- name: Upgrade pip in container
run: python -m pip install --upgrade pip
- name: Install Odoo upgrade util
run: python -m pip install git+https://github.com/odoo/upgrade-util@master
- name: Add Noviat CI Tools to PATH - name: Add Noviat CI Tools to PATH
run: | run: |
git clone https://${{ secrets.PRIVATE_TOKEN }}@github.com/Noviat-CI/noviat-ci-tools.git /opt/noviat-ci-tools git clone https://github.com/Noviat-CI/noviat-ci-tools.git /opt/noviat-ci-tools
echo "/opt/noviat-ci-tools" >> $GITHUB_PATH echo "/opt/noviat-ci-tools" >> $GITHUB_PATH
- name: Clone Odoo Enterprise - name: Clone Odoo Enterprise
if: ${{ matrix.odoo_enterprise == 1 }} if: ${{ matrix.odoo_enterprise == 1 }}
run : | run : |
git clone https://${{ secrets.PRIVATE_TOKEN }}@github.com/odoo/enterprise.git --depth 1 -b 18.0 /opt/enterprise git clone https://github.com/odoo/enterprise.git --depth 1 -b 18.0 /opt/enterprise
- name: Clone Noviat Dependencies - name: Clone Noviat Dependencies
env:
PRIVATE_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: clone_oca_dependencies_by_noviat run: clone_oca_dependencies_by_noviat
- name: Create addons path - name: Create addons path
run: | run: |
@@ -97,21 +116,30 @@ jobs:
run: | run: |
echo "server_wide_modules = web,module_change_auto_install" >> ${ODOO_RC} echo "server_wide_modules = web,module_change_auto_install" >> ${ODOO_RC}
echo "ODOO_MODULES_AUTO_INSTALL_DISABLED=${{ matrix.EXCLUDE_MODULES }}" >> $GITHUB_ENV echo "ODOO_MODULES_AUTO_INSTALL_DISABLED=${{ matrix.EXCLUDE_MODULES }}" >> $GITHUB_ENV
- name: Inject GitHub token for Noviat orgs in test-requirements.txt
run: |
sed -i -E "s#https://github.com/(Noviat-(Projects|Generic|ARP|Internal))#https://${{ secrets.PRIVATE_TOKEN }}@github.com/\1#g" test-requirements.txt
- name: Install addons and dependencies - name: Install addons and dependencies
run: | run: |
(ADDONS_PATH=${ADDONS_PATH} ADDONS_DIR=${INSTALL_ADDONS_DIR} oca_install_addons) (ADDONS_PATH=${ADDONS_PATH} ADDONS_DIR=${INSTALL_ADDONS_DIR} oca_install_addons)
- name: Install external dependencies of core addons (not in Odoo requirements.txt)
run: |
(ADDONS_DIR=${INSTALL_ADDONS_DIR} noviat_install_odoo_external_dependencies)
- name: Initialize test db - name: Initialize test db
run: oca_init_test_database run: oca_init_test_database
- name: Run tests - name: Run tests
run: oca_run_tests run: oca_run_tests
- name: Generate coverage files - name: Generate coverage files
id: coverage
run: | run: |
# oca_run_tests exits early without coverage data when there is no
# addon to test (e.g. a freshly scaffolded version branch).
if [ -z "$(oca_list_addons_to_test)" ]; then
echo "No addon to test, skipping coverage report."
exit 0
fi
coverage report -m coverage report -m
coverage xml -o coverage.xml coverage xml -o coverage.xml
echo "report=true" >> "$GITHUB_OUTPUT"
- name: Code Coverage Summary Report - name: Code Coverage Summary Report
if: steps.coverage.outputs.report == 'true'
uses: irongut/CodeCoverageSummary@v1.3.0 uses: irongut/CodeCoverageSummary@v1.3.0
with: with:
filename: 'coverage.xml' filename: 'coverage.xml'
@@ -120,7 +148,8 @@ jobs:
output: 'both' output: 'both'
hide_complexity: true hide_complexity: true
- name: Write to Job Summary - name: Write to Job Summary
if: steps.coverage.outputs.report == 'true'
run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
- name: Update .pot files - name: Update .pot files
run: noviat_export_and_push_pot https://x-access-token:${{ secrets.PRIVATE_TOKEN }}@github.com/${{ github.repository }} run: noviat_export_and_push_pot https://github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' }}
+42
View File
@@ -0,0 +1,42 @@
name: Update addons table after merge
on:
push:
branches:
- "18.0"
paths-ignore:
- "README.md"
permissions:
contents: write
jobs:
gen-addons-table:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-python@v7
with:
python-version: "3.11"
- name: Install pre-commit
run: pip install pre-commit
- name: Run the manual hook to (re)generate the addons table
run: pre-commit run -a --hook-stage manual oca-gen-addons-table
continue-on-error: true
- name: Commit & push if changed
env:
TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: |
if ! git diff --quiet; then
git config user.name "noviat-ci-bot"
git config user.email "bot+ci@noviat.com"
git add -A
git commit -m "update addons table"
# Header instead of URL credentials, see test.yml
git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(printf 'x-access-token:%s' "$TOKEN" | base64 -w0)"
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git push origin HEAD:18.0
fi
+35 -14
View File
@@ -22,7 +22,7 @@ exclude: |
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
python: python3 python: python3
node: "22.9.0" node: "22.23.3"
repos: repos:
- repo: local - repo: local
hooks: hooks:
@@ -39,25 +39,38 @@ repos:
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/sbidoul/whool - repo: https://github.com/sbidoul/whool
rev: v1.2 rev: v1.3
hooks: hooks:
- id: whool-init - id: whool-init
additional_dependencies:
# force a fresh pre-commit env: up-to-date core addons lists and
# Odoo 20 support (since v1.16.0)
- manifestoo-core>=1.16.1
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: b89f767503be6ab2b11e4f50a7557cb20066e667 rev: b8311a95009805a6e5593f0390f52c0fa350117f
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://www.noviat.com/"] args: ["https://www.noviat.com/"]
- id: oca-gen-external-dependencies - id: oca-gen-external-dependencies
additional_dependencies:
# an outdated manifestoo-core ignores recent core addons, and wipes
# requirements.txt on an Odoo series it does not know
- manifestoo-core>=1.16.1
- id: oca-gen-addons-table - id: oca-gen-addons-table
stages: [manual]
- repo: https://github.com/OCA/odoo-pre-commit-hooks - repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.33 rev: v0.2.27
hooks: hooks:
- id: oca-checks-odoo-module - id: oca-checks-odoo-module
- id: oca-checks-odoo-module-fixit
args:
- --disable=use-header-comments
- id: oca-checks-po - id: oca-checks-po
args: args:
- --disable=po-pretty-format - --disable=po-pretty-format
- --fix
- repo: local - repo: local
hooks: hooks:
- id: prettier - id: prettier
@@ -71,8 +84,8 @@ repos:
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
language: node language: node
additional_dependencies: additional_dependencies:
- "prettier@3.3.3" - "prettier@3.9.9"
- "@prettier/plugin-xml@3.4.1" - "@prettier/plugin-xml@3.4.2"
- repo: local - repo: local
hooks: hooks:
- id: eslint - id: eslint
@@ -85,10 +98,11 @@ repos:
types: [javascript] types: [javascript]
language: node language: node
additional_dependencies: additional_dependencies:
- "eslint@9.12.0" - "eslint@10.11.0"
- "eslint-plugin-jsdoc@50.3.1" - "eslint-plugin-jsdoc@65.0.0"
- "globals@17.12.0"
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0 rev: v6.0.0
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
# exclude autogenerated files # exclude autogenerated files
@@ -97,8 +111,6 @@ repos:
# exclude autogenerated files # exclude autogenerated files
exclude: /README\.rst$|\.pot?$ exclude: /README\.rst$|\.pot?$
- id: debug-statements - id: debug-statements
- id: fix-encoding-pragma
args: ["--remove"]
- id: check-case-conflict - id: check-case-conflict
- id: check-docstring-first - id: check-docstring-first
- id: check-executables-have-shebangs - id: check-executables-have-shebangs
@@ -109,21 +121,30 @@ repos:
- id: check-xml - id: check-xml
- id: mixed-line-ending - id: mixed-line-ending
args: ["--fix=lf"] args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v3.21.2
hooks:
- id: pyupgrade
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.8 rev: v0.16.9
hooks: hooks:
- id: ruff - id: ruff
args: [--fix, --exit-non-zero-on-fix] args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format - id: ruff-format
# markdown is prettier's job (ruff >= 0.16 also formats its code blocks)
types_or: [python, pyi, jupyter]
- repo: https://github.com/OCA/pylint-odoo - repo: https://github.com/OCA/pylint-odoo
rev: v9.1.3 rev: v10.0.11
hooks: hooks:
- id: pylint_odoo - id: pylint_odoo
name: pylint with optional checks name: pylint (optional, core only)
args: args:
- --rcfile=.pylintrc - --rcfile=.pylintrc
- --exit-zero - --exit-zero
verbose: true verbose: true
- id: pylint_odoo - id: pylint_odoo
name: pylint-odoo (mandatory, blocking)
args: args:
- --disable=missing-readme
- --rcfile=.pylintrc-mandatory - --rcfile=.pylintrc-mandatory
verbose: true
+42 -47
View File
@@ -1,9 +1,11 @@
[MASTER] [MASTER]
ignore-patterns=["^.*/TODO/.*$"] ignore-patterns=["^.*/TODO/.*$"]
load-plugins=pylint_odoo load-plugins=pylint_odoo
score=n score=n
[IMPORTS]
deprecated-modules=pdb,pudb,ipdb,bs4
[ODOOLINT] [ODOOLINT]
#readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" #readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Noviat manifest-required-authors=Noviat
@@ -22,22 +24,15 @@ disable=all
# .pylintrc-mandatory containing only mandatory checks is used the pre-commit # .pylintrc-mandatory containing only mandatory checks is used the pre-commit
# config as a blocking check. # config as a blocking check.
enable=anomalous-backslash-in-string, enable =
api-one-deprecated, anomalous-backslash-in-string,
api-one-multi-together,
assignment-from-none, assignment-from-none,
attribute-deprecated, attribute-deprecated,
class-camelcase,
dangerous-default-value, dangerous-default-value,
dangerous-view-replace-wo-priority, deprecated-module,
development-status-allowed, development-status-allowed,
duplicate-id-csv,
duplicate-key, duplicate-key,
duplicate-xml-fields,
duplicate-xml-record-id,
eval-referenced,
eval-used, eval-used,
incoherent-interpreter-exec-perm,
license-allowed, license-allowed,
manifest-author-string, manifest-author-string,
manifest-deprecated-key, manifest-deprecated-key,
@@ -48,73 +43,73 @@ enable=anomalous-backslash-in-string,
method-inverse, method-inverse,
method-required-super, method-required-super,
method-search, method-search,
openerp-exception-warning,
pointless-statement, pointless-statement,
pointless-string-statement, pointless-string-statement,
print-used, print-used,
redundant-keyword-arg, redundant-keyword-arg,
redundant-modulename-xml,
reimported, reimported,
relative-import,
return-in-init, return-in-init,
rst-syntax-error,
sql-injection, sql-injection,
too-few-format-args, too-few-format-args,
translation-field, translation-field,
translation-required, translation-required,
unreachable, unreachable,
use-vim-comment, use-vim-comment,
wrong-tabs-instead-of-spaces, # >= 15
xml-syntax-error,
attribute-string-redundant, attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited, consider-merging-classes-inherited,
context-overridden, context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass, except-pass,
file-not-used,
invalid-commit, invalid-commit,
manifest-external-assets,
manifest-maintainers-list, manifest-maintainers-list,
missing-newline-extrafiles, missing-readme,
# missing-readme,
missing-return, missing-return,
odoo-addons-relative-import, odoo-addons-relative-import,
old-api7-method-defined, odoo-exception-warning,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter, renamed-field-parameter,
resource-not-exist, resource-not-exist,
str-format-used,
test-folder-imported, test-folder-imported,
translation-contains-variable, translation-contains-variable,
translation-positional-used, translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri, website-manifest-key-not-valid-uri,
xml-attribute-translatable, # >= 16
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
external-request-timeout, external-request-timeout,
# >= 19
bad-builtin-groupby,
category-allowed,
deprecated-name-get,
deprecated-odoo-model-method,
deprecated-self-cr,
inheritable-method-lambda,
inheritable-method-string,
invalid-email,
manifest-behind-migrations,
manifest-data-duplicated,
missing-odoo-file,
no-raise-unlink,
no-search-all,
no-wizard-in-models,
prohibited-method-override,
prefer-env-translation,
translation-format-interpolation,
translation-format-truncated,
translation-injection,
translation-fstring-interpolation,
translation-not-lazy,
translation-too-few-args,
translation-too-many-args,
translation-unsupported-format,
no-write-in-compute,
odoolint,
# >= 20
manifest-summary-multiline,
# messages that do not cause the lint step to fail # messages that do not cause the lint step to fail
consider-merging-classes-inherited, consider-merging-classes-inherited,
create-user-wo-reset-password,
dangerous-filter-wo-user,
deprecated-module,
file-not-used,
invalid-commit, invalid-commit,
missing-manifest-dependency, missing-readme,
missing-newline-extrafiles,
# missing-readme,
no-utf8-coding-comment,
odoo-addons-relative-import, odoo-addons-relative-import,
old-api7-method-defined, redefined-builtin
redefined-builtin,
too-complex,
unnecessary-utf8-coding-comment
[REPORTS] [REPORTS]
+41 -35
View File
@@ -3,6 +3,9 @@ ignore-patterns=["^.*/TODO/.*$"]
load-plugins=pylint_odoo load-plugins=pylint_odoo
score=n score=n
[IMPORTS]
deprecated-modules=pdb,pudb,ipdb,bs4
[ODOOLINT] [ODOOLINT]
#readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" #readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Noviat manifest-required-authors=Noviat
@@ -14,22 +17,15 @@ valid-odoo-versions=18.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
enable=anomalous-backslash-in-string, enable =
api-one-deprecated, anomalous-backslash-in-string,
api-one-multi-together,
assignment-from-none, assignment-from-none,
attribute-deprecated, attribute-deprecated,
class-camelcase,
dangerous-default-value, dangerous-default-value,
dangerous-view-replace-wo-priority, deprecated-module,
development-status-allowed, development-status-allowed,
duplicate-id-csv,
duplicate-key, duplicate-key,
duplicate-xml-fields,
duplicate-xml-record-id,
eval-referenced,
eval-used, eval-used,
incoherent-interpreter-exec-perm,
license-allowed, license-allowed,
manifest-author-string, manifest-author-string,
manifest-deprecated-key, manifest-deprecated-key,
@@ -40,57 +36,67 @@ enable=anomalous-backslash-in-string,
method-inverse, method-inverse,
method-required-super, method-required-super,
method-search, method-search,
openerp-exception-warning,
pointless-statement, pointless-statement,
pointless-string-statement, pointless-string-statement,
print-used, print-used,
redundant-keyword-arg, redundant-keyword-arg,
redundant-modulename-xml,
reimported, reimported,
relative-import,
return-in-init, return-in-init,
rst-syntax-error,
sql-injection, sql-injection,
too-few-format-args, too-few-format-args,
translation-field, translation-field,
translation-required, translation-required,
unreachable, unreachable,
use-vim-comment, use-vim-comment,
wrong-tabs-instead-of-spaces, # >= 15
xml-syntax-error,
attribute-string-redundant, attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited, consider-merging-classes-inherited,
context-overridden, context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass, except-pass,
file-not-used,
invalid-commit, invalid-commit,
manifest-external-assets,
manifest-maintainers-list, manifest-maintainers-list,
missing-newline-extrafiles, missing-readme,
# missing-readme,
missing-return, missing-return,
odoo-addons-relative-import, odoo-addons-relative-import,
old-api7-method-defined, odoo-exception-warning,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter, renamed-field-parameter,
resource-not-exist, resource-not-exist,
str-format-used,
test-folder-imported, test-folder-imported,
translation-contains-variable, translation-contains-variable,
translation-positional-used, translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri, website-manifest-key-not-valid-uri,
xml-attribute-translatable, # >= 16
xml-deprecated-qweb-directive, external-request-timeout,
xml-deprecated-tree-attribute, # >= 19
external-request-timeout bad-builtin-groupby,
category-allowed,
deprecated-name-get,
deprecated-odoo-model-method,
deprecated-self-cr,
inheritable-method-lambda,
inheritable-method-string,
invalid-email,
manifest-behind-migrations,
manifest-data-duplicated,
missing-odoo-file,
no-raise-unlink,
no-search-all,
no-wizard-in-models,
prohibited-method-override,
prefer-env-translation,
translation-format-interpolation,
translation-format-truncated,
translation-injection,
translation-fstring-interpolation,
translation-not-lazy,
translation-too-few-args,
translation-too-many-args,
translation-unsupported-format,
no-write-in-compute,
odoolint,
# >= 20
manifest-summary-multiline
[REPORTS] [REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
+8 -1
View File
@@ -3,7 +3,14 @@ target-version = "py310"
fix = true fix = true
[lint] [lint]
extend-select = [ # Explicit rule set: ruff >= 0.16 enables 413 rules by default, many of which go
# against Odoo idioms (naive UTC datetimes, `self = self.with_context()`, list
# `_inherit`). "E4", "E7", "E9" and "F" are the defaults of ruff < 0.16.
select = [
"E4",
"E7",
"E9",
"F",
"B", "B",
"C90", "C90",
"E501", # line too long (default 88) "E501", # line too long (default 88)
-1
View File
@@ -1,6 +1,5 @@
[![Pre-commit Status](https://github.com/Noviat/account_ebics/actions/workflows/pre-commit.yml/badge.svg?branch=18.0)](https://github.com/Noviat/account_ebics/actions/workflows/pre-commit.yml?query=branch%3A18.0) [![Pre-commit Status](https://github.com/Noviat/account_ebics/actions/workflows/pre-commit.yml/badge.svg?branch=18.0)](https://github.com/Noviat/account_ebics/actions/workflows/pre-commit.yml?query=branch%3A18.0)
[![Build Status](https://github.com/Noviat/account_ebics/actions/workflows/test.yml/badge.svg?branch=18.0)](https://github.com/Noviat/account_ebics/actions/workflows/test.yml?query=branch%3A18.0) [![Build Status](https://github.com/Noviat/account_ebics/actions/workflows/test.yml/badge.svg?branch=18.0)](https://github.com/Noviat/account_ebics/actions/workflows/test.yml?query=branch%3A18.0)
<!-- /!\ do not modify above this line --> <!-- /!\ do not modify above this line -->
# Modules dedicated to manage the EBICS protocol # Modules dedicated to manage the EBICS protocol
-1
View File
@@ -26,7 +26,6 @@
"wizards/ebics_admin_order.xml", "wizards/ebics_admin_order.xml",
"views/menu.xml", "views/menu.xml",
], ],
"installable": True,
"application": True, "application": True,
"external_dependencies": { "external_dependencies": {
"python": [ "python": [
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo noupdate="1"> <odoo noupdate="1">
<!-- Download formats --> <!-- Download formats -->
@@ -3,7 +3,7 @@
import os import os
from openupgradelib import openupgrade # pylint: disable=W7936 from openupgradelib import openupgrade # pylint: disable=E0401
@openupgrade.migrate() @openupgrade.migrate()
+2 -2
View File
@@ -11,13 +11,13 @@ class AccountJournal(models.Model):
comodel_name="ebics.config", comodel_name="ebics.config",
relation="account_journal_ebics_config_rel", relation="account_journal_ebics_config_rel",
readonly=True, readonly=True,
string="Ebics Configs", string="EBICS Configs",
) )
ebics_config_id = fields.Many2one( ebics_config_id = fields.Many2one(
comodel_name="ebics.config", comodel_name="ebics.config",
compute="_compute_ebics_config_id", compute="_compute_ebics_config_id",
compute_sudo=True, compute_sudo=True,
string="Ebics Config", string="EBICS Config",
) )
@api.depends("ebics_config_ids") @api.depends("ebics_config_ids")
+7 -8
View File
@@ -8,7 +8,7 @@ import re
from odoo import api, fields, models from odoo import api, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__) # lint-ignore=unused-logger
class EbicsConfig(models.Model): class EbicsConfig(models.Model):
@@ -160,13 +160,12 @@ class EbicsConfig(models.Model):
for rec in self: for rec in self:
rec.company_ids = rec.journal_ids.mapped("company_id") rec.company_ids = rec.journal_ids.mapped("company_id")
def unlink(self): @api.ondelete(at_uninstall=False)
for ebics_config in self: def _unlink_except_active(self):
if ebics_config.state == "active": if any(rec.state == "active" for rec in self):
raise UserError( raise UserError(
self.env._("You cannot remove active EBICS configurations.") self.env._("You cannot remove active EBICS configurations.")
) )
return super().unlink()
def set_to_draft(self): def set_to_draft(self):
return self.write({"state": "draft"}) return self.write({"state": "draft"})
@@ -199,8 +198,8 @@ class EbicsConfig(models.Model):
if not os.path.exists(dirname): if not os.path.exists(dirname):
raise UserError( raise UserError(
self.env._( self.env._(
"EBICS Keys Root Directory %s is not available." "EBICS Keys Root Directory %(dir)s is not available."
"\nPlease contact your system administrator." "\nPlease contact your system administrator.",
dir=dirname,
) )
% dirname
) )
+12 -11
View File
@@ -9,12 +9,12 @@ from traceback import format_exception
from lxml import etree from lxml import etree
from odoo import fields, models from odoo import api, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.addons.base.models.res_bank import sanitize_account_number from odoo.addons.base.models.res_bank import sanitize_account_number
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__) # lint-ignore=unused-logger
DUP_CHECK_FORMATS = ["cfonb120", "camt053"] DUP_CHECK_FORMATS = ["cfonb120", "camt053"]
@@ -63,7 +63,6 @@ class EbicsFile(models.Model):
) )
user_id = fields.Many2one( user_id = fields.Many2one(
comodel_name="res.users", comodel_name="res.users",
string="User",
default=lambda self: self.env.user, default=lambda self: self.env.user,
readonly=True, readonly=True,
) )
@@ -91,13 +90,16 @@ class EbicsFile(models.Model):
help="Companies sharing this EBICS file.", help="Companies sharing this EBICS file.",
) )
def unlink(self): @api.ondelete(at_uninstall=False)
ff_methods = self._file_format_methods() def _unlink_except_done(self):
for ebics_file in self: if any(rec.state == "done" for rec in self):
if ebics_file.state == "done":
raise UserError( raise UserError(
self.env._("You can only remove EBICS files in state 'Draft'.") self.env._("You can only remove EBICS files in state 'Draft'.")
) )
def unlink(self):
ff_methods = self._file_format_methods()
for ebics_file in self:
# execute format specific actions # execute format specific actions
ff = ebics_file.format_id.download_process_method ff = ebics_file.format_id.download_process_method
if ff in ff_methods: if ff in ff_methods:
@@ -385,8 +387,7 @@ class EbicsFile(models.Model):
file_data = base64.b64decode(self.data).replace(b"\n", b"").replace(b"\r", b"") file_data = base64.b64decode(self.data).replace(b"\n", b"").replace(b"\r", b"")
if len(file_data) % 120: if len(file_data) % 120:
message = self.env._( message = self.env._(
"Incorrect CFONB120 file:\n" "Incorrect CFONB120 file:\nthe file is not divisible in 120 char lines"
"the file is not divisible in 120 char lines"
) )
res["notifications"].append({"type": "error", "message": message}) res["notifications"].append({"type": "error", "message": message})
return datas return datas
@@ -650,7 +651,7 @@ class EbicsFile(models.Model):
self.env._( self.env._(
"The current version of the 'account_ebics' module " "The current version of the 'account_ebics' module "
"has no support to automatically process EBICS files " "has no support to automatically process EBICS files "
"with format %s." "with format %s.",
self.format_id.name,
) )
% self.format_id.name
) )
+4 -6
View File
@@ -69,8 +69,7 @@ class EbicsUserID(models.Model):
string="Users", string="Users",
required=True, required=True,
domain=[("share", "=", False)], domain=[("share", "=", False)],
help="Users who are allowed to use this EBICS UserID for " help="Users who are allowed to use this EBICS UserID for bank transactions.",
" bank transactions.",
) )
signature_class = fields.Selection( signature_class = fields.Selection(
selection=[("E", "Single signature"), ("T", "Transport signature")], selection=[("E", "Single signature"), ("T", "Transport signature")],
@@ -149,7 +148,7 @@ class EbicsUserID(models.Model):
# create self-signed X.509 certificates # create self-signed X.509 certificates
ebics_key_x509 = fields.Boolean( ebics_key_x509 = fields.Boolean(
string="X509 support", string="X509 support",
help="Set this flag in order to work with " "self-signed X.509 certificates", help="Set this flag in order to work with self-signed X.509 certificates",
) )
ebics_key_x509_dn_cn = fields.Char( ebics_key_x509_dn_cn = fields.Char(
string="Common Name [CN]", string="Common Name [CN]",
@@ -417,7 +416,7 @@ class EbicsUserID(models.Model):
if not ebics_config_bank: if not ebics_config_bank:
raise UserError( raise UserError(
self.env._( self.env._(
"No bank defined for the financial journal " "of the EBICS Config" "No bank defined for the financial journal of the EBICS Config"
) )
) )
try: try:
@@ -476,8 +475,7 @@ class EbicsUserID(models.Model):
if cc in ["FR", "DE"]: if cc in ["FR", "DE"]:
lang = cc lang = cc
else: else:
lang = self.env.user.lang or self.env["res.lang"].search([])[0].code lang = self.env.user.lang[:2]
lang = lang[:2]
lang = lang.lower() lang = lang.lower()
lang = lang if lang in INI_LETTER_LANGS else "en" lang = lang if lang in INI_LETTER_LANGS else "en"
fn_date = fields.Date.today().isoformat() fn_date = fields.Date.today().isoformat()
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record model="res.groups" id="group_ebics_manager"> <record id="group_ebics_manager" model="res.groups">
<field name="name">EBICS Manager</field> <field name="name">EBICS Manager</field>
<field name="category_id" ref="base.module_category_hidden" /> <field name="category_id" ref="base.module_category_hidden" />
</record> </record>
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_config_view_list" model="ir.ui.view"> <record id="ebics_config_view_list" model="ir.ui.view">
<field name="name">ebics.config.list</field> <field name="name">ebics.config.list</field>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_file_format_view_search" model="ir.ui.view"> <record id="ebics_file_format_view_search" model="ir.ui.view">
<field name="name">ebics.file.format.search</field> <field name="name">ebics.file.format.search</field>
+3 -3
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_file_view_search" model="ir.ui.view"> <record id="ebics_file_view_search" model="ir.ui.view">
<field name="name">ebics.file.search</field> <field name="name">ebics.file.search</field>
@@ -81,7 +81,7 @@
<record id="ebics_file_view_form" model="ir.ui.view"> <record id="ebics_file_view_form" model="ir.ui.view">
<field name="name">ebics.file.form</field> <field name="name">ebics.file.form</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form create="false"> <form create="false">
<header> <header>
@@ -177,7 +177,7 @@
<record id="ebics_file_view_form_result" model="ir.ui.view"> <record id="ebics_file_view_form_result" model="ir.ui.view">
<field name="name">ebics.file.process.result</field> <field name="name">ebics.file.process.result</field>
<field name="model">ebics.file</field> <field name="model">ebics.file</field>
<field name="priority">100</field> <field name="priority" eval="100" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Process EBICS File"> <form string="Process EBICS File">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_userid_view_list" model="ir.ui.view"> <record id="ebics_userid_view_list" model="ir.ui.view">
<field name="name">ebics.userid.list</field> <field name="name">ebics.userid.list</field>
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<menuitem <menuitem
id="ebics_processing_menu" id="ebics_processing_menu"
+3 -3
View File
@@ -37,9 +37,9 @@ class EbicsAdminOrder(models.TransientModel):
self.ensure_one() self.ensure_one()
client = self._setup_client() client = self._setup_client()
if not client: if not client:
self.note += ( self.note += self.env._(
self.env._("EBICS client setup failed for connection '%s'") "EBICS client setup failed for connection '%s'",
% self.ebics_config_id.name self.ebics_config_id.name,
) )
else: else:
try: try:
+3 -3
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_admin_order_view_form" model="ir.ui.view"> <record id="ebics_admin_order_view_form" model="ir.ui.view">
<field name="name">EBICS Administrative Order</field> <field name="name">EBICS Administrative Order</field>
<field name="model">ebics.admin.order</field> <field name="model">ebics.admin.order</field>
<field name="inherit_id" ref="ebics_xfer_view_form_download" /> <field name="inherit_id" ref="ebics_xfer_view_form_download" />
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date_from" position="attributes"> <field name="date_from" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
@@ -31,7 +31,7 @@
<record id="ebics_admin_order_view_form_result" model="ir.ui.view"> <record id="ebics_admin_order_view_form_result" model="ir.ui.view">
<field name="name">EBICS Administrative Order result</field> <field name="name">EBICS Administrative Order result</field>
<field name="model">ebics.admin.order</field> <field name="model">ebics.admin.order</field>
<field name="priority">2</field> <field name="priority" eval="2" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Administrative Order result"> <form string="EBICS Administrative Order result">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_change_passphrase_view_form" model="ir.ui.view"> <record id="ebics_change_passphrase_view_form" model="ir.ui.view">
<field name="name">EBICS Keys Change Passphrase</field> <field name="name">EBICS Keys Change Passphrase</field>
<field name="model">ebics.change.passphrase</field> <field name="model">ebics.change.passphrase</field>
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Keys Change Passphrase"> <form string="EBICS Keys Change Passphrase">
<group> <group>
@@ -40,7 +40,7 @@
<record id="ebics_change_passphrase_view_form_result" model="ir.ui.view"> <record id="ebics_change_passphrase_view_form_result" model="ir.ui.view">
<field name="name">EBICS Keys Change Passphrase</field> <field name="name">EBICS Keys Change Passphrase</field>
<field name="model">ebics.change.passphrase</field> <field name="model">ebics.change.passphrase</field>
<field name="priority">2</field> <field name="priority" eval="2" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Keys Change Passphrase"> <form string="EBICS Keys Change Passphrase">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
+9 -13
View File
@@ -224,9 +224,9 @@ class EbicsXfer(models.TransientModel):
client = self._setup_client() client = self._setup_client()
if not client: if not client:
err_cnt += 1 err_cnt += 1
self.note += ( self.note += self.env._(
self.env._("EBICS client setup failed for connection '%s'") "EBICS client setup failed for connection '%s'",
% self.ebics_config_id.name self.ebics_config_id.name,
) )
else: else:
download_formats = ( download_formats = (
@@ -336,11 +336,8 @@ class EbicsXfer(models.TransientModel):
if ebics_files: if ebics_files:
self.note += "\n" self.note += "\n"
for f in ebics_files: for f in ebics_files:
self.note += ( self.note += self.env._(
self.env._( "EBICS File '%s' is available for further processing.", f.name
"EBICS File '%s' is available for further processing."
)
% f.name
) )
self.note += "\n" self.note += "\n"
@@ -406,9 +403,8 @@ class EbicsXfer(models.TransientModel):
OrderID = client.upload(order_type, upload_data) OrderID = client.upload(order_type, upload_data)
if OrderID: if OrderID:
self.note += "\n" self.note += "\n"
self.note += ( self.note += self.env._(
self.env._("EBICS File has been uploaded (OrderID %s).") "EBICS File has been uploaded (OrderID %s).", OrderID
% OrderID
) )
ef_note = "" ef_note = ""
if self.env.context.get("origin"): if self.env.context.get("origin"):
@@ -619,9 +615,9 @@ class EbicsXfer(models.TransientModel):
self.env._( self.env._(
"EBICS File with name '%s' has already been downloaded." "EBICS File with name '%s' has already been downloaded."
"\nPlease check this file and rename in case there is " "\nPlease check this file and rename in case there is "
"no risk on duplicate transactions." "no risk on duplicate transactions.",
fn,
) )
% fn
) )
data = base64.encodebytes(data) data = base64.encodebytes(data)
ef_vals = { ef_vals = {
+5 -5
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_xfer_view_form_download" model="ir.ui.view"> <record id="ebics_xfer_view_form_download" model="ir.ui.view">
<field name="name">EBICS File Download</field> <field name="name">EBICS File Download</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Download"> <form string="EBICS File Download">
<group> <group>
@@ -55,7 +55,7 @@
<record id="ebics_xfer_view_form_upload" model="ir.ui.view"> <record id="ebics_xfer_view_form_upload" model="ir.ui.view">
<field name="name">EBICS File Upload</field> <field name="name">EBICS File Upload</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Upload"> <form string="EBICS File Upload">
<group> <group>
@@ -120,7 +120,7 @@
<record id="ebics_xfer_view_form_result" model="ir.ui.view"> <record id="ebics_xfer_view_form_result" model="ir.ui.view">
<field name="name">EBICS File Transfer</field> <field name="name">EBICS File Transfer</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">2</field> <field name="priority" eval="2" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS File Transfer"> <form string="EBICS File Transfer">
<separator colspan="4" string="Results :" /> <separator colspan="4" string="Results :" />
@@ -148,7 +148,7 @@
<record id="ebics_xfer_view_form_mark_as_downloaded" model="ir.ui.view"> <record id="ebics_xfer_view_form_mark_as_downloaded" model="ir.ui.view">
<field name="name">Mark EBICS files as Downloaded</field> <field name="name">Mark EBICS files as Downloaded</field>
<field name="model">ebics.xfer</field> <field name="model">ebics.xfer</field>
<field name="priority">1</field> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="EBICS Mark as Downloaded"> <form string="EBICS Mark as Downloaded">
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
+1 -2
View File
@@ -3,7 +3,7 @@
{ {
"name": "EBICS - Scheduled File Import", "name": "EBICS - Scheduled File Import",
"version": "18.0.1.0.1", "version": "18.0.1.0.2",
"license": "AGPL-3", "license": "AGPL-3",
"author": "Noviat", "author": "Noviat",
"website": "https://www.noviat.com/", "website": "https://www.noviat.com/",
@@ -16,6 +16,5 @@
"views/ebics_batch_log_views.xml", "views/ebics_batch_log_views.xml",
"views/menu.xml", "views/menu.xml",
], ],
"installable": True,
"images": ["static/description/banner.png"], "images": ["static/description/banner.png"],
} }
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="state">code</field> <field name="state">code</field>
<field name="code">model._batch_import()</field> <field name="code">model._batch_import()</field>
<field name="user_id" ref="base.user_root" /> <field name="user_id" ref="base.user_root" />
<field name="interval_number">1</field> <field name="interval_number" eval="1" />
<field name="interval_type">days</field> <field name="interval_type">days</field>
<field name="active" eval="False" /> <field name="active" eval="False" />
</record> </record>
@@ -46,13 +46,12 @@ class EbicsBatchLog(models.Model):
rec.has_draft_files = "draft" in rec.file_ids.mapped("state") rec.has_draft_files = "draft" in rec.file_ids.mapped("state")
rec.file_count = len(rec.file_ids) rec.file_count = len(rec.file_ids)
def unlink(self): @api.ondelete(at_uninstall=False)
for log in self: def _unlink_except_draft(self):
if log.state != "draft": if any(log.state != "draft" for log in self):
raise UserError( raise UserError(
self.env._("Only log objects in state 'draft' can be deleted !") self.env._("Only log objects in state 'draft' can be deleted !")
) )
return super().unlink()
def button_draft(self): def button_draft(self):
self.state = "draft" self.state = "draft"
@@ -93,9 +92,8 @@ class EbicsBatchLog(models.Model):
) )
ebics_file_ids = [] ebics_file_ids = []
for config in configs: for config in configs:
err_msg = ( err_msg = self.env._(
self.env._("Error while processing EBICS connection '%s' :\n") "Error while processing EBICS connection '%s' :\n", config.name
% config.name
) )
if config.state == "draft": if config.state == "draft":
import_dict["errors"].append( import_dict["errors"].append(
@@ -1,4 +1,4 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="ebics_batch_log_view_search" model="ir.ui.view"> <record id="ebics_batch_log_view_search" model="ir.ui.view">
<field name="name">ebics.batch.log.search</field> <field name="name">ebics.batch.log.search</field>
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<menuitem <menuitem
id="ebics_batch_log_menu" id="ebics_batch_log_menu"
@@ -14,6 +14,5 @@
"views/account_journal_views.xml", "views/account_journal_views.xml",
"views/account_batch_payment_views.xml", "views/account_batch_payment_views.xml",
], ],
"installable": True,
"images": ["static/description/banner.png"], "images": ["static/description/banner.png"],
} }
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="view_batch_payment_form" model="ir.ui.view"> <record id="view_batch_payment_form" model="ir.ui.view">
<field name="name">account.batch.payment.form</field> <field name="name">account.batch.payment.form</field>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="view_account_journal_form_ebics_payment_method" model="ir.ui.view"> <record id="view_account_journal_form_ebics_payment_method" model="ir.ui.view">
<field name="name">account.journal.form.ebics.payment.method</field> <field name="name">account.journal.form.ebics.payment.method</field>
@@ -4,7 +4,7 @@
{ {
"name": "EBICS - Bank Statement Import (OCA)", "name": "EBICS - Bank Statement Import (OCA)",
"summary": "Process EBICS statement files with the OCA bank statement import", "summary": "Process EBICS statement files with the OCA bank statement import",
"version": "18.0.1.0.1", "version": "18.0.1.0.2",
"author": "Noviat", "author": "Noviat",
"website": "https://www.noviat.com/", "website": "https://www.noviat.com/",
"category": "Hidden", "category": "Hidden",
@@ -13,7 +13,6 @@
"account_ebics", "account_ebics",
"account_statement_import_file", "account_statement_import_file",
], ],
"installable": True,
"auto_install": True, "auto_install": True,
"images": ["static/description/banner.png"], "images": ["static/description/banner.png"],
} }
@@ -4,7 +4,7 @@
import logging import logging
from datetime import date, datetime from datetime import date, datetime
from odoo import _, models from odoo import models
from odoo.addons.base.models.res_bank import sanitize_account_number from odoo.addons.base.models.res_bank import sanitize_account_number
@@ -39,8 +39,7 @@ class AccountStatementImport(models.TransientModel):
sanitized_number = sanitize_account_number(account_number) sanitized_number = sanitize_account_number(account_number)
check_curr = sanitized_number[-3:] check_curr = sanitized_number[-3:]
if check_curr.isalpha(): if check_curr.isalpha():
all_currencies = self.env["res.currency"].search([]) if self.env["res.currency"].search([("name", "=", check_curr)], limit=1):
if check_curr in all_currencies.mapped("name"):
sanitized_number = sanitized_number[:-3] sanitized_number = sanitized_number[:-3]
return sanitized_number return sanitized_number
@@ -49,7 +48,7 @@ class AccountStatementImport(models.TransientModel):
if self.env.context.get("active_model") == "ebics.file": if self.env.context.get("active_model") == "ebics.file":
message = False message = False
if len(stmts_vals) == 0: if len(stmts_vals) == 0:
message = _("This file doesn't contain any statement.") message = self.env._("This file doesn't contain any statement.")
if not message: if not message:
no_st_line = True no_st_line = True
for vals in stmts_vals: for vals in stmts_vals:
@@ -57,10 +56,10 @@ class AccountStatementImport(models.TransientModel):
no_st_line = False no_st_line = False
break break
if no_st_line: if no_st_line:
message = _("This file doesn't contain any transaction.") message = self.env._("This file doesn't contain any transaction.")
if message: if message:
log_msg = ( log_msg = (
_("Error detected while processing an EBICS File") self.env._("Error detected while processing an EBICS File")
+ ":\n" + ":\n"
+ message + message
) )
@@ -99,7 +98,7 @@ class AccountStatementImport(models.TransientModel):
else: else:
st_date = st_vals["date"] st_date = st_vals["date"]
messages.append( messages.append(
_( self.env._(
"Statement %(st_name)s dated %(date)s " "Statement %(st_name)s dated %(date)s "
"has already been imported.", "has already been imported.",
st_name=st_vals["name"], st_name=st_vals["name"],
@@ -108,7 +107,9 @@ class AccountStatementImport(models.TransientModel):
) )
if not transactions: if not transactions:
messages.append(_("This file doesn't contain any transaction.")) messages.append(
self.env._("This file doesn't contain any transaction.")
)
if messages: if messages:
result["notifications"].append( result["notifications"].append(
{"type": "warning", "message": "\n".join(messages)} {"type": "warning", "message": "\n".join(messages)}
+1 -2
View File
@@ -4,7 +4,7 @@
{ {
"name": "EBICS - Odoo Enterprise Integration", "name": "EBICS - Odoo Enterprise Integration",
"summary": "Place the EBICS menus in the Odoo Enterprise accounting application", "summary": "Place the EBICS menus in the Odoo Enterprise accounting application",
"version": "18.0.1.0.0", "version": "18.0.1.0.1",
"author": "Noviat", "author": "Noviat",
"website": "https://www.noviat.com/", "website": "https://www.noviat.com/",
"category": "Hidden", "category": "Hidden",
@@ -14,7 +14,6 @@
"accountant", "accountant",
], ],
"data": ["views/account_ebics_menu.xml"], "data": ["views/account_ebics_menu.xml"],
"installable": True,
"auto_install": True, "auto_install": True,
"images": ["static/description/banner.png"], "images": ["static/description/banner.png"],
} }
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="account_ebics.ebics_processing_menu" model="ir.ui.menu"> <record id="account_ebics.ebics_processing_menu" model="ir.ui.menu">
<field name="parent_id" eval="ref('accountant.menu_accounting')" /> <field name="parent_id" eval="ref('accountant.menu_accounting')" />
@@ -15,5 +15,4 @@
"views/account_payment_mode_views.xml", "views/account_payment_mode_views.xml",
], ],
"images": ["static/description/banner.png"], "images": ["static/description/banner.png"],
"installable": True,
} }
@@ -73,8 +73,7 @@ class AccountPaymentOrder(models.Model):
if not self.journal_id.ebics_config_id: if not self.journal_id.ebics_config_id:
raise UserError( raise UserError(
self.env._( self.env._(
"No active EBICS configuration available " "No active EBICS configuration available for the selected bank."
"for the selected bank."
) )
) )
ctx.update( ctx.update(
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="account_payment_mode_form" model="ir.ui.view"> <record id="account_payment_mode_form" model="ir.ui.view">
<field name="name">account.payment.mode.form</field> <field name="name">account.payment.mode.form</field>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<record id="account_payment_order_form" model="ir.ui.view"> <record id="account_payment_order_form" model="ir.ui.view">
<field name="name">account.payment.order.form</field> <field name="name">account.payment.order.form</field>
+1 -1
View File
@@ -1,3 +1,3 @@
odoo-addon-module_change_auto_install odoo-addon-module_change_auto_install
openupgradelib openupgradelib
cryptography<37 lxml_html_clean