From 77c793868e1687b501ceb205132164600c519a67 Mon Sep 17 00:00:00 2001 From: bosd Date: Sun, 14 Jan 2024 13:26:41 +0100 Subject: [PATCH 1/4] bank-statement-import [14.0] repo update --- .copier-answers.yml | 9 +++++---- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++++++++++- .github/workflows/test.yml | 6 +++--- .gitignore | 1 + .pre-commit-config.yaml | 23 ++++++++++++++++++++--- 6 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 2759f63b..77b43710 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -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: {} @@ -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 @@ -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 diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc68..fed88d70 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,6 +22,7 @@ globals: odoo: readonly openerp: readonly owl: readonly + luxon: readonly # Styling is handled by Prettier, so we only need to enable AST rules; # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 755f8a22..602ecbca 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit run: pre-commit run --all-files --show-diff-on-failure --color=always + env: + # Consider valid a PR that changes README fragments but doesn't + # change the README.rst file itself. It's not really a problem + # because the bot will update it anyway after merge. This way, we + # lower the barrier for functional contributors that want to fix the + # readme fragments, while still letting developers get README + # auto-generated (which also helps functionals when using runboat). + # DOCS https://pre-commit.com/#temporarily-disabling-hooks + SKIP: oca-gen-addon-readme - name: Check that all files generated by pre-commit are in git run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 215b84b0..326c1255 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -50,7 +50,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies diff --git a/.gitignore b/.gitignore index 9c283fd4..0090721f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d039d94d..18b285ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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: @@ -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: @@ -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 From 04235a2b8975ef87b47ab6294e6a76e3bb573af2 Mon Sep 17 00:00:00 2001 From: bosd Date: Sun, 14 Jan 2024 13:37:14 +0100 Subject: [PATCH 2/4] [FIX]account_statement_import: deprecated data node --- account_statement_import/demo/partner_bank.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/account_statement_import/demo/partner_bank.xml b/account_statement_import/demo/partner_bank.xml index ff5a9939..fcf2fbc4 100644 --- a/account_statement_import/demo/partner_bank.xml +++ b/account_statement_import/demo/partner_bank.xml @@ -5,7 +5,6 @@ Licence LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0). --> - BE02631118262640 @@ -31,5 +30,4 @@ - From ecaa50c28464ef3e30ad21009f3c2e9822f921a7 Mon Sep 17 00:00:00 2001 From: bosd Date: Fri, 2 Feb 2024 21:42:25 +0100 Subject: [PATCH 3/4] [FIX] account_statement_import: dot files --- account_statement_import/wizard/account_statement_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_statement_import/wizard/account_statement_import.py b/account_statement_import/wizard/account_statement_import.py index 2a72221c..90fb7c81 100644 --- a/account_statement_import/wizard/account_statement_import.py +++ b/account_statement_import/wizard/account_statement_import.py @@ -106,7 +106,7 @@ class AccountStatementImport(models.TransientModel): journal = self._match_journal(account_number, currency) if not journal.default_account_id: raise UserError( - _("The Bank Accounting Account in not set on the " "journal '%s'.") + _("The Bank Accounting Account in not set on the journal '%s'.") % journal.display_name ) # Prepare statement data to be used for bank statements creation From 2509cf3074969690d020bb78f47c2aa6c8a666f5 Mon Sep 17 00:00:00 2001 From: bosd Date: Fri, 2 Feb 2024 22:22:27 +0100 Subject: [PATCH 4/4] [FIX] account_statement_import: manual update dot files --- account_statement_import/i18n/account_statement_import.pot | 2 +- account_statement_import/i18n/ar.po | 6 +++--- account_statement_import/i18n/da.po | 6 +++--- account_statement_import/i18n/de.po | 6 +++--- account_statement_import/i18n/et.po | 6 +++--- account_statement_import/i18n/fi.po | 6 +++--- account_statement_import/i18n/he.po | 6 +++--- account_statement_import/i18n/hr.po | 6 +++--- account_statement_import/i18n/hu.po | 6 +++--- account_statement_import/i18n/ko.po | 6 +++--- account_statement_import/i18n/lt.po | 6 +++--- account_statement_import/i18n/mn.po | 6 +++--- account_statement_import/i18n/pl.po | 6 +++--- account_statement_import/i18n/ru.po | 6 +++--- account_statement_import/i18n/sk.po | 6 +++--- account_statement_import/i18n/tr.po | 6 +++--- account_statement_import/i18n/uk.po | 6 +++--- account_statement_import/i18n/vi.po | 6 +++--- account_statement_import/i18n/zh_CN.po | 6 +++--- account_statement_import/i18n/zh_TW.po | 6 +++--- 20 files changed, 58 insertions(+), 58 deletions(-) diff --git a/account_statement_import/i18n/account_statement_import.pot b/account_statement_import/i18n/account_statement_import.pot index eb415470..bda81aa5 100644 --- a/account_statement_import/i18n/account_statement_import.pot +++ b/account_statement_import/i18n/account_statement_import.pot @@ -161,7 +161,7 @@ msgstr "" #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 #, 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 "" #. module: account_statement_import diff --git a/account_statement_import/i18n/ar.po b/account_statement_import/i18n/ar.po index 95a7de0e..9b406787 100644 --- a/account_statement_import/i18n/ar.po +++ b/account_statement_import/i18n/ar.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/da.po b/account_statement_import/i18n/da.po index 0c9df1bb..2640ee50 100644 --- a/account_statement_import/i18n/da.po +++ b/account_statement_import/i18n/da.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/de.po b/account_statement_import/i18n/de.po index 1ad36295..af333fa9 100644 --- a/account_statement_import/i18n/de.po +++ b/account_statement_import/i18n/de.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/et.po b/account_statement_import/i18n/et.po index 15ab70ad..8668ee05 100644 --- a/account_statement_import/i18n/et.po +++ b/account_statement_import/i18n/et.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/fi.po b/account_statement_import/i18n/fi.po index 1f15f98a..99b32e8b 100644 --- a/account_statement_import/i18n/fi.po +++ b/account_statement_import/i18n/fi.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/he.po b/account_statement_import/i18n/he.po index c594e7ad..811e9d07 100644 --- a/account_statement_import/i18n/he.po +++ b/account_statement_import/i18n/he.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/hr.po b/account_statement_import/i18n/hr.po index 96a8e218..6f14e28a 100644 --- a/account_statement_import/i18n/hr.po +++ b/account_statement_import/i18n/hr.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/hu.po b/account_statement_import/i18n/hu.po index a6502495..f9b22c43 100644 --- a/account_statement_import/i18n/hu.po +++ b/account_statement_import/i18n/hu.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/ko.po b/account_statement_import/i18n/ko.po index cd591aa7..ca1cbf7e 100644 --- a/account_statement_import/i18n/ko.po +++ b/account_statement_import/i18n/ko.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/lt.po b/account_statement_import/i18n/lt.po index 85a86624..10061fad 100644 --- a/account_statement_import/i18n/lt.po +++ b/account_statement_import/i18n/lt.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/mn.po b/account_statement_import/i18n/mn.po index 9dd6906d..cd4c745d 100644 --- a/account_statement_import/i18n/mn.po +++ b/account_statement_import/i18n/mn.po @@ -175,8 +175,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 @@ -201,7 +201,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 diff --git a/account_statement_import/i18n/pl.po b/account_statement_import/i18n/pl.po index 68c09f2e..abbeb2ec 100644 --- a/account_statement_import/i18n/pl.po +++ b/account_statement_import/i18n/pl.po @@ -189,8 +189,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 "Konto świadczenia (%s) nie pokrywa się z dziennikiem (%s)." +msgid "The Bank Accounting Account is not set on the journal '%s'." +msgstr "Konto świadczenia nie pokrywa się z dziennikiem (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 @@ -215,7 +215,7 @@ msgstr "" msgid "" "The currency of the bank statement (%s) is not the same as the currency of " "the journal '%s' (%s)." -msgstr "Konto świadczenia (%s) nie pokrywa się z dziennikiem (%s)." +msgstr "Konto świadczenia (%s) nie pokrywa się z dziennikiem '%s' (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 diff --git a/account_statement_import/i18n/ru.po b/account_statement_import/i18n/ru.po index c8a9a7ad..41f4a392 100644 --- a/account_statement_import/i18n/ru.po +++ b/account_statement_import/i18n/ru.po @@ -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 "Счёт этой Выписки (%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 @@ -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 "Счёт этой Выписки (%s) не совпадает с Журналом (%s)." +msgstr "Счёт этой Выписки (%s) не совпадает с Журналом '%s' (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 diff --git a/account_statement_import/i18n/sk.po b/account_statement_import/i18n/sk.po index 3c71e0a5..5af2a169 100644 --- a/account_statement_import/i18n/sk.po +++ b/account_statement_import/i18n/sk.po @@ -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 "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha (%s)." +msgid "The Bank Accounting Account is not set on the journal '%s'." +msgstr "Účet tohoto výpisu nie je rovnaký ako účtovná kniha (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 @@ -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 "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha (%s)." +msgstr "Účet tohoto výpisu (%s) nie je rovnaký ako účtovná kniha '%s' (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 diff --git a/account_statement_import/i18n/tr.po b/account_statement_import/i18n/tr.po index 18aa925e..c6352b47 100644 --- a/account_statement_import/i18n/tr.po +++ b/account_statement_import/i18n/tr.po @@ -184,8 +184,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 "Bu kaydın (%s) hesabı, yevmiye (%s) aynı değil." +msgid "The Bank Accounting Account is not set on the journal '%s'." +msgstr "Bu kaydın hesabı, yevmiye (%s) aynı değil." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 @@ -212,7 +212,7 @@ msgid "" "the journal '%s' (%s)." msgstr "" "Banka hesap özetinin para birimi (%s) yevmiye para birimi ile aynı değil " -"(%s)." +"'%s' (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 diff --git a/account_statement_import/i18n/uk.po b/account_statement_import/i18n/uk.po index 98a7c9ee..09b05840 100644 --- a/account_statement_import/i18n/uk.po +++ b/account_statement_import/i18n/uk.po @@ -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 @@ -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 diff --git a/account_statement_import/i18n/vi.po b/account_statement_import/i18n/vi.po index dec8f5f0..66693eeb 100644 --- a/account_statement_import/i18n/vi.po +++ b/account_statement_import/i18n/vi.po @@ -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 "" -"Tài khoản của giao dịch này (%s) không giống với tài khoản của sổ nhật ký " +"Tài khoản của giao dịch này không giống với tài khoản của sổ nhật ký " "(%s)." #. module: account_statement_import @@ -210,7 +210,7 @@ msgid "" "the journal '%s' (%s)." msgstr "" "Tài khoản của giao dịch này (%s) không giống với tài khoản của sổ nhật ký " -"(%s)." +"'%s' (%s)." #. module: account_statement_import #: code:addons/account_statement_import/wizard/account_statement_import.py:0 diff --git a/account_statement_import/i18n/zh_CN.po b/account_statement_import/i18n/zh_CN.po index fe50fb53..64f2652a 100644 --- a/account_statement_import/i18n/zh_CN.po +++ b/account_statement_import/i18n/zh_CN.po @@ -187,8 +187,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 @@ -213,7 +213,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 diff --git a/account_statement_import/i18n/zh_TW.po b/account_statement_import/i18n/zh_TW.po index f0dee120..df8a6677 100644 --- a/account_statement_import/i18n/zh_TW.po +++ b/account_statement_import/i18n/zh_TW.po @@ -175,8 +175,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 @@ -201,7 +201,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