From 7a62a01080f777e601a8a027cf5b55cc1df74b40 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 22 Apr 2024 13:59:19 +0200 Subject: [PATCH] [IMP] account_statement_import_camt: pre-commit auto fixes --- account_statement_import_camt/README.rst | 43 +++++++++++-------- .../models/account_bank_statement_line.py | 1 - .../models/account_journal.py | 4 +- .../models/bank_statement.py | 1 - .../models/parser.py | 21 +++++---- account_statement_import_camt/pyproject.toml | 3 ++ .../readme/CONTRIBUTORS.md | 15 +++++++ .../readme/CONTRIBUTORS.rst | 9 ---- .../readme/{CREDITS.rst => CREDITS.md} | 3 +- .../{DESCRIPTION.rst => DESCRIPTION.md} | 0 .../static/description/index.html | 21 +++++---- .../tests/test_import_bank_statement.py | 2 +- .../static/description/index.html | 11 +++-- 13 files changed, 79 insertions(+), 55 deletions(-) create mode 100644 account_statement_import_camt/pyproject.toml create mode 100644 account_statement_import_camt/readme/CONTRIBUTORS.md delete mode 100644 account_statement_import_camt/readme/CONTRIBUTORS.rst rename account_statement_import_camt/readme/{CREDITS.rst => CREDITS.md} (73%) rename account_statement_import_camt/readme/{DESCRIPTION.rst => DESCRIPTION.md} (100%) diff --git a/account_statement_import_camt/README.rst b/account_statement_import_camt/README.rst index e62a5679..24646f67 100644 --- a/account_statement_import_camt/README.rst +++ b/account_statement_import_camt/README.rst @@ -17,13 +17,13 @@ CAMT Format Bank Statements Import :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--statement--import-lightgray.png?logo=github - :target: https://github.com/OCA/bank-statement-import/tree/16.0/account_statement_import_camt + :target: https://github.com/OCA/bank-statement-import/tree/17.0/account_statement_import_camt :alt: OCA/bank-statement-import .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_camt + :target: https://translation.odoo-community.org/projects/bank-statement-import-17-0/bank-statement-import-17-0-account_statement_import_camt :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&target_branch=16.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&target_branch=17.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -49,30 +49,37 @@ Credits ======= Authors -~~~~~~~ +------- * Therp BV Contributors -~~~~~~~~~~~~ +------------ -* Holger Brunn -* Stefan Rijnhart -* Ronald Portier -* Andrea Stirpe -* Maxence Groine -* Iryna Vyshnevska -* `Trobz `_: +- Holger Brunn - * Son Ho +- Stefan Rijnhart + +- Ronald Portier + +- Andrea Stirpe + +- Maxence Groine + +- Iryna Vyshnevska + +- `Trobz `__: + + - Son Ho Other credits -~~~~~~~~~~~~~ +------------- -The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp +The migration of this module from 15.0 to 16.0 was financially supported +by Camptocamp Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -84,6 +91,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-statement-import `_ project on GitHub. +This module is part of the `OCA/bank-statement-import `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_statement_import_camt/models/account_bank_statement_line.py b/account_statement_import_camt/models/account_bank_statement_line.py index 9846f90a..4725b447 100644 --- a/account_statement_import_camt/models/account_bank_statement_line.py +++ b/account_statement_import_camt/models/account_bank_statement_line.py @@ -4,7 +4,6 @@ from odoo import models class AccountBankStatementLine(models.Model): - _inherit = "account.bank.statement.line" def write(self, vals): diff --git a/account_statement_import_camt/models/account_journal.py b/account_statement_import_camt/models/account_journal.py index 55ff4dc6..86f7910e 100644 --- a/account_statement_import_camt/models/account_journal.py +++ b/account_statement_import_camt/models/account_journal.py @@ -8,8 +8,6 @@ class AccountJournal(models.Model): _inherit = "account.journal" def _get_bank_statements_available_import_formats(self): - res = super( - AccountJournal, self - )._get_bank_statements_available_import_formats() + res = super()._get_bank_statements_available_import_formats() res.extend([_("camt.053.001.02"), _("camt.054.001.02")]) return res diff --git a/account_statement_import_camt/models/bank_statement.py b/account_statement_import_camt/models/bank_statement.py index 313e5c17..8b1d24c2 100644 --- a/account_statement_import_camt/models/bank_statement.py +++ b/account_statement_import_camt/models/bank_statement.py @@ -4,7 +4,6 @@ from odoo import models class AccountBankStatement(models.Model): - _inherit = "account.bank.statement" def reconciliation_widget_preprocess(self): diff --git a/account_statement_import_camt/models/parser.py b/account_statement_import_camt/models/parser.py index 15b52673..b9b6443d 100644 --- a/account_statement_import_camt/models/parser.py +++ b/account_statement_import_camt/models/parser.py @@ -39,7 +39,7 @@ class CamtParser(models.AbstractModel): If xpath_str is a list (or iterable), it will be seen as a series of search path's in order of preference. The first item that results in a found node will be used to set a value.""" - if not isinstance(xpath_str, (list, tuple)): + if not isinstance(xpath_str, list | tuple): xpath_str = [xpath_str] for search_str in xpath_str: found_node = node.xpath(search_str, namespaces={"ns": ns}) @@ -246,20 +246,23 @@ class CamtParser(models.AbstractModel): def generate_narration(self, transaction): # this block ensure compatibility with v13 transaction["narration"] = { - "%s (RltdPties/Nm)" - % _("Partner Name"): transaction.get("partner_name", ""), - "%s (RltdPties/Acct)" - % _("Partner Account Number"): transaction.get("account_number", ""), - "%s (BookgDt)" % _("Transaction Date"): transaction.get("date", ""), + "{} (RltdPties/Nm)".format(_("Partner Name")): transaction.get( + "partner_name", "" + ), + "{} (RltdPties/Acct)".format(_("Partner Account Number")): transaction.get( + "account_number", "" + ), + "{} (BookgDt)".format(_("Transaction Date")): transaction.get("date", ""), _("Reference"): transaction.get("ref", ""), _("Communication"): transaction.get("name", ""), - "%s (BkTxCd)" - % _("Transaction Type"): transaction.get("transaction_type", ""), + "{} (BkTxCd)".format(_("Transaction Type")): transaction.get( + "transaction_type", "" + ), **transaction["narration"], } transaction["narration"] = "\n".join( - ["%s: %s" % (key, val) for key, val in transaction["narration"].items()] + [f"{key}: {val}" for key, val in transaction["narration"].items()] ) def parse_entry(self, ns, node): diff --git a/account_statement_import_camt/pyproject.toml b/account_statement_import_camt/pyproject.toml new file mode 100644 index 00000000..4231d0cc --- /dev/null +++ b/account_statement_import_camt/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/account_statement_import_camt/readme/CONTRIBUTORS.md b/account_statement_import_camt/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..3a549353 --- /dev/null +++ b/account_statement_import_camt/readme/CONTRIBUTORS.md @@ -0,0 +1,15 @@ +- Holger Brunn \<\> + +- Stefan Rijnhart \<\> + +- Ronald Portier \<\> + +- Andrea Stirpe \<\> + +- Maxence Groine \<\> + +- Iryna Vyshnevska \<\> + +- [Trobz](https://trobz.com): + + > - Son Ho \<\> diff --git a/account_statement_import_camt/readme/CONTRIBUTORS.rst b/account_statement_import_camt/readme/CONTRIBUTORS.rst deleted file mode 100644 index 168338a7..00000000 --- a/account_statement_import_camt/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,9 +0,0 @@ -* Holger Brunn -* Stefan Rijnhart -* Ronald Portier -* Andrea Stirpe -* Maxence Groine -* Iryna Vyshnevska -* `Trobz `_: - - * Son Ho diff --git a/account_statement_import_camt/readme/CREDITS.rst b/account_statement_import_camt/readme/CREDITS.md similarity index 73% rename from account_statement_import_camt/readme/CREDITS.rst rename to account_statement_import_camt/readme/CREDITS.md index 70bc307a..291e14c8 100644 --- a/account_statement_import_camt/readme/CREDITS.rst +++ b/account_statement_import_camt/readme/CREDITS.md @@ -1 +1,2 @@ -The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp +The migration of this module from 15.0 to 16.0 was financially supported +by Camptocamp diff --git a/account_statement_import_camt/readme/DESCRIPTION.rst b/account_statement_import_camt/readme/DESCRIPTION.md similarity index 100% rename from account_statement_import_camt/readme/DESCRIPTION.rst rename to account_statement_import_camt/readme/DESCRIPTION.md diff --git a/account_statement_import_camt/static/description/index.html b/account_statement_import_camt/static/description/index.html index ca6b98bf..b1942b86 100644 --- a/account_statement_import_camt/static/description/index.html +++ b/account_statement_import_camt/static/description/index.html @@ -1,3 +1,4 @@ + @@ -8,10 +9,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +276,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code { margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +302,7 @@ span.option { span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,7 +370,7 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:6af9753752cdfa39f3d971e084ed946578dc75aafbbc9a600aeb0b8b06b4427b !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-statement-import Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/bank-statement-import Translate me on Weblate Try me on Runboat

Module to import SEPA CAMT.053 and CAMT.054 Format bank statement files.

Table of contents

@@ -388,7 +390,7 @@ ul.auto-toc {

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -425,16 +427,19 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Other credits

-

The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp

+

The migration of this module from 15.0 to 16.0 was financially supported +by Camptocamp

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/bank-statement-import project on GitHub.

+

This module is part of the OCA/bank-statement-import project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/account_statement_import_camt/tests/test_import_bank_statement.py b/account_statement_import_camt/tests/test_import_bank_statement.py index e05abe11..2e3c3704 100644 --- a/account_statement_import_camt/tests/test_import_bank_statement.py +++ b/account_statement_import_camt/tests/test_import_bank_statement.py @@ -53,7 +53,7 @@ class TestParserCommon(TransactionCase): with open(get_module_resource(*inputfile_path.parts), "rb") as inputf: res = self.parser.parse(inputf.read()) # Read the output file, store the expected imported values - with open(get_module_resource(*goldenfile_path.parts), "r") as goldf: + with open(get_module_resource(*goldenfile_path.parts)) as goldf: gold_name, gold_lines = goldf.name, goldf.readlines() # Save the imported values in a tmp file to compare them w/ the expected values with tempfile.NamedTemporaryFile(mode="w+", suffix=".pydata") as tempf: diff --git a/account_statement_import_file/static/description/index.html b/account_statement_import_file/static/description/index.html index ec2f814c..31e895f3 100644 --- a/account_statement_import_file/static/description/index.html +++ b/account_statement_import_file/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code { margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.option { span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -448,7 +449,9 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.