diff --git a/account_statement_import_camt54/README.rst b/account_statement_import_camt54/README.rst index cce080e0b..35fd35266 100644 --- a/account_statement_import_camt54/README.rst +++ b/account_statement_import_camt54/README.rst @@ -92,6 +92,7 @@ Contributors - `Trobz `__: - Son Ho + - Do Anh Duy Other credits ------------- @@ -101,6 +102,8 @@ Other credits supported by Camptocamp - The migration of this module from 16.0 to 17.0 was financially supported by Camptocamp +- The migration of this module from 17.0 to 18.0 was financially + supported by Camptocamp Maintainers ----------- diff --git a/account_statement_import_camt54/__manifest__.py b/account_statement_import_camt54/__manifest__.py index 246474115..bd7915150 100644 --- a/account_statement_import_camt54/__manifest__.py +++ b/account_statement_import_camt54/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Bank Account Camt54 Import", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Account", "website": "https://github.com/OCA/bank-statement-import", "author": "camptocamp, " "Odoo Community Association (OCA)", diff --git a/account_statement_import_camt54/migrations/17.0.1.0.0/pre-migrate.py b/account_statement_import_camt54/migrations/17.0.1.0.0/pre-migrate.py deleted file mode 100644 index e2f0f3e12..000000000 --- a/account_statement_import_camt54/migrations/17.0.1.0.0/pre-migrate.py +++ /dev/null @@ -1,8 +0,0 @@ -def migrate(cr, version): - cr.execute( - """ - UPDATE ir_config_parameter - SET key = 'qrr_partner_ref' - WHERE key = 'isr_partner_ref' - """ - ) diff --git a/account_statement_import_camt54/models/parser.py b/account_statement_import_camt54/models/parser.py index 1e6e72cf3..b66106a5c 100644 --- a/account_statement_import_camt54/models/parser.py +++ b/account_statement_import_camt54/models/parser.py @@ -1,7 +1,7 @@ # Copyright 2019 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import _, models +from odoo import models from odoo.exceptions import UserError @@ -23,7 +23,7 @@ def _get_partner_ref(self, isr): size = 6 else: raise UserError( - _( + self.env._( "Config parameter `qrr_partner_ref` is wrong.\n" "It must be in format `i[,n]` \n" "where `i` is the position of the first digit and\n" @@ -38,7 +38,7 @@ def _get_partner_ref(self, isr): end = start + size except ValueError: raise UserError( - _( + self.env._( "Config parameter `qrr_partner_ref` is wrong.\n" "It must be in format `i[,n]` \n" "`i` and `n` must be integers.\n" diff --git a/account_statement_import_camt54/readme/CONTRIBUTORS.md b/account_statement_import_camt54/readme/CONTRIBUTORS.md index 7d370c6e9..ce47f7209 100644 --- a/account_statement_import_camt54/readme/CONTRIBUTORS.md +++ b/account_statement_import_camt54/readme/CONTRIBUTORS.md @@ -5,3 +5,4 @@ - [Trobz](https://trobz.com): > - Son Ho \<\> + > - Do Anh Duy \<\> diff --git a/account_statement_import_camt54/readme/CREDITS.md b/account_statement_import_camt54/readme/CREDITS.md index 50ea01074..d3a4e5b5c 100644 --- a/account_statement_import_camt54/readme/CREDITS.md +++ b/account_statement_import_camt54/readme/CREDITS.md @@ -1,3 +1,4 @@ - Digital4efficiency.ch - The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp - The migration of this module from 16.0 to 17.0 was financially supported by Camptocamp +- The migration of this module from 17.0 to 18.0 was financially supported by Camptocamp diff --git a/account_statement_import_camt54/static/description/index.html b/account_statement_import_camt54/static/description/index.html index c354fdbf1..bfa59a7e0 100644 --- a/account_statement_import_camt54/static/description/index.html +++ b/account_statement_import_camt54/static/description/index.html @@ -431,6 +431,7 @@

Contributors

@@ -444,6 +445,8 @@

Other credits

supported by Camptocamp
  • The migration of this module from 16.0 to 17.0 was financially supported by Camptocamp
    • +
  • The migration of this module from 17.0 to 18.0 was financially +supported by Camptocamp
    • diff --git a/account_statement_import_camt54/tests/test_statement.py b/account_statement_import_camt54/tests/test_statement.py index a1569527f..b672e5b10 100644 --- a/account_statement_import_camt54/tests/test_statement.py +++ b/account_statement_import_camt54/tests/test_statement.py @@ -40,7 +40,7 @@ def setUpClass(cls): ) def _load_statement(self): - testfile = file_path("account_statement_import_camt/test_files/test-camt054") + testfile = file_path("account_statement_import_camt/tests/samples/test-camt054") with open(testfile, "rb") as datafile: camt_file = base64.b64encode(datafile.read()) self.env["account.statement.import"].create( @@ -50,7 +50,14 @@ def _load_statement(self): } ).import_file_button() bank_st_record = self.env["account.bank.statement"].search( - [("name", "=", "20220120000000000000000")], limit=1 + [ + ( + "name", + "in", + ["TBNKC Statement 2022-01-26", "20220120000000000000000"], + ) + ], + limit=1, ) statement_lines = bank_st_record.line_ids return statement_lines