From 479c604ae6753e7643b653acf9fc3a15f22374b8 Mon Sep 17 00:00:00 2001 From: Sergio Zanchetta Date: Thu, 9 Sep 2021 21:41:20 +0200 Subject: [PATCH] [MIG] account_bank_statement_import_txt_xlsx: Migration to 14.0 --- .../models/__init__.py | 6 ---- .../security/ir.model.access.csv | 3 -- .../README.rst | 0 .../__init__.py | 0 .../__manifest__.py | 10 +++---- .../data/map_data.xml | 2 +- ...account_bank_statement_import_txt_xlsx.pot | 0 .../i18n/nl.po | 0 .../i18n/zh_CN.po | 0 .../models/__init__.py | 6 ++++ .../models/account_journal.py | 2 +- .../models/account_statement_import.py | 8 ++--- .../account_statement_import_sheet_mapping.py | 2 +- .../account_statement_import_sheet_parser.py | 2 +- .../readme/CONFIGURE.rst | 0 .../readme/CONTRIBUTORS.rst | 0 .../readme/DESCRIPTION.rst | 0 .../readme/HISTORY.rst | 0 .../readme/USAGE.rst | 0 .../security/ir.model.access.csv | 2 ++ .../static/description/icon.png | Bin .../static/description/index.html | 0 .../tests/__init__.py | 2 +- .../tests/fixtures/balance.csv | 0 .../tests/fixtures/debit_credit.csv | 0 .../tests/fixtures/empty_statement_en.csv | 0 .../tests/fixtures/empty_statement_en.xlsx | Bin .../tests/fixtures/multi_currency.csv | 0 .../tests/fixtures/original_currency.csv | 0 .../fixtures/original_currency_empty.csv | 0 .../tests/fixtures/sample_statement_en.csv | 0 .../tests/fixtures/sample_statement_en.xlsx | Bin .../test_account_statement_import_txt_xlsx.py | 28 +++++++++--------- .../views/account_journal_views.xml | 0 .../views/account_statement_import.xml | 8 ++--- ...account_statement_import_sheet_mapping.xml | 14 ++++----- .../wizards/__init__.py | 2 +- ...t_statement_import_sheet_mapping_wizard.py | 16 +++++----- ..._statement_import_sheet_mapping_wizard.xml | 12 ++++---- .../account_bank_statement_import_txt_xlsx | 1 - .../addons/account_statement_import_txt_xlsx | 1 + .../setup.py | 0 42 files changed, 63 insertions(+), 64 deletions(-) delete mode 100644 account_bank_statement_import_txt_xlsx/models/__init__.py delete mode 100644 account_bank_statement_import_txt_xlsx/security/ir.model.access.csv rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/README.rst (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/__init__.py (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/__manifest__.py (75%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/data/map_data.xml (94%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/i18n/account_bank_statement_import_txt_xlsx.pot (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/i18n/nl.po (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/i18n/zh_CN.po (100%) create mode 100644 account_statement_import_txt_xlsx/models/__init__.py rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/models/account_journal.py (88%) rename account_bank_statement_import_txt_xlsx/models/account_bank_statement_import.py => account_statement_import_txt_xlsx/models/account_statement_import.py (76%) rename account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_mapping.py => account_statement_import_txt_xlsx/models/account_statement_import_sheet_mapping.py (99%) rename account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_parser.py => account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py (99%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/readme/CONFIGURE.rst (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/readme/CONTRIBUTORS.rst (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/readme/DESCRIPTION.rst (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/readme/HISTORY.rst (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/readme/USAGE.rst (100%) create mode 100644 account_statement_import_txt_xlsx/security/ir.model.access.csv rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/static/description/icon.png (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/static/description/index.html (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/__init__.py (53%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/balance.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/debit_credit.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/empty_statement_en.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/empty_statement_en.xlsx (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/multi_currency.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/original_currency.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/original_currency_empty.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/sample_statement_en.csv (100%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/tests/fixtures/sample_statement_en.xlsx (100%) rename account_bank_statement_import_txt_xlsx/tests/test_account_bank_statement_import_txt_xlsx.py => account_statement_import_txt_xlsx/tests/test_account_statement_import_txt_xlsx.py (93%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/views/account_journal_views.xml (100%) rename account_bank_statement_import_txt_xlsx/views/account_bank_statement_import.xml => account_statement_import_txt_xlsx/views/account_statement_import.xml (66%) rename account_bank_statement_import_txt_xlsx/views/account_bank_statement_import_sheet_mapping.xml => account_statement_import_txt_xlsx/views/account_statement_import_sheet_mapping.xml (85%) rename {account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/wizards/__init__.py (50%) rename account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.py => account_statement_import_txt_xlsx/wizards/account_statement_import_sheet_mapping_wizard.py (91%) rename account_bank_statement_import_txt_xlsx/wizards/account_bank_statement_import_sheet_mapping_wizard.xml => account_statement_import_txt_xlsx/wizards/account_statement_import_sheet_mapping_wizard.xml (93%) delete mode 120000 setup/account_bank_statement_import_txt_xlsx/odoo/addons/account_bank_statement_import_txt_xlsx create mode 120000 setup/account_statement_import_txt_xlsx/odoo/addons/account_statement_import_txt_xlsx rename setup/{account_bank_statement_import_txt_xlsx => account_statement_import_txt_xlsx}/setup.py (100%) diff --git a/account_bank_statement_import_txt_xlsx/models/__init__.py b/account_bank_statement_import_txt_xlsx/models/__init__.py deleted file mode 100644 index cddf714a5f..0000000000 --- a/account_bank_statement_import_txt_xlsx/models/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from . import account_bank_statement_import_sheet_mapping -from . import account_bank_statement_import_sheet_parser -from . import account_bank_statement_import -from . import account_journal diff --git a/account_bank_statement_import_txt_xlsx/security/ir.model.access.csv b/account_bank_statement_import_txt_xlsx/security/ir.model.access.csv deleted file mode 100644 index 1e4598ba87..0000000000 --- a/account_bank_statement_import_txt_xlsx/security/ir.model.access.csv +++ /dev/null @@ -1,3 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -access_account_bank_statement_import_sheet_mapping_manager,account.bank.statement.import.sheet.mapping:account.group_account_manager,model_account_bank_statement_import_sheet_mapping,account.group_account_manager,1,1,1,1 -access_account_bank_statement_import_sheet_mapping_user,account.bank.statement.import.sheet.mapping:account.group_account_user,model_account_bank_statement_import_sheet_mapping,account.group_account_user,1,0,0,0 diff --git a/account_bank_statement_import_txt_xlsx/README.rst b/account_statement_import_txt_xlsx/README.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/README.rst rename to account_statement_import_txt_xlsx/README.rst diff --git a/account_bank_statement_import_txt_xlsx/__init__.py b/account_statement_import_txt_xlsx/__init__.py similarity index 100% rename from account_bank_statement_import_txt_xlsx/__init__.py rename to account_statement_import_txt_xlsx/__init__.py diff --git a/account_bank_statement_import_txt_xlsx/__manifest__.py b/account_statement_import_txt_xlsx/__manifest__.py similarity index 75% rename from account_bank_statement_import_txt_xlsx/__manifest__.py rename to account_statement_import_txt_xlsx/__manifest__.py index 1e39a2aced..a1fcea1342 100644 --- a/account_bank_statement_import_txt_xlsx/__manifest__.py +++ b/account_statement_import_txt_xlsx/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Account Bank Statement Import TXT/CSV/XLSX", "summary": "Import TXT/CSV or XLSX files as Bank Statements in Odoo", - "version": "13.0.1.0.4", + "version": "14.0.1.0.0", "category": "Accounting", "website": "https://github.com/OCA/bank-statement-import", "author": "ForgeFlow, CorporateHub, Odoo Community Association (OCA)", @@ -13,7 +13,7 @@ "license": "AGPL-3", "installable": True, "depends": [ - "account_bank_statement_import", + "account_statement_import", "multi_step_wizard", "web_widget_dropdown_dynamic", ], @@ -21,9 +21,9 @@ "data": [ "security/ir.model.access.csv", "data/map_data.xml", - "views/account_bank_statement_import_sheet_mapping.xml", - "views/account_bank_statement_import.xml", + "views/account_statement_import_sheet_mapping.xml", + "views/account_statement_import.xml", "views/account_journal_views.xml", - "wizards/account_bank_statement_import_sheet_mapping_wizard.xml", + "wizards/account_statement_import_sheet_mapping_wizard.xml", ], } diff --git a/account_bank_statement_import_txt_xlsx/data/map_data.xml b/account_statement_import_txt_xlsx/data/map_data.xml similarity index 94% rename from account_bank_statement_import_txt_xlsx/data/map_data.xml rename to account_statement_import_txt_xlsx/data/map_data.xml index 4f56e64eb4..9156ec36b3 100644 --- a/account_bank_statement_import_txt_xlsx/data/map_data.xml +++ b/account_statement_import_txt_xlsx/data/map_data.xml @@ -7,7 +7,7 @@ Sample Statement comma diff --git a/account_bank_statement_import_txt_xlsx/i18n/account_bank_statement_import_txt_xlsx.pot b/account_statement_import_txt_xlsx/i18n/account_bank_statement_import_txt_xlsx.pot similarity index 100% rename from account_bank_statement_import_txt_xlsx/i18n/account_bank_statement_import_txt_xlsx.pot rename to account_statement_import_txt_xlsx/i18n/account_bank_statement_import_txt_xlsx.pot diff --git a/account_bank_statement_import_txt_xlsx/i18n/nl.po b/account_statement_import_txt_xlsx/i18n/nl.po similarity index 100% rename from account_bank_statement_import_txt_xlsx/i18n/nl.po rename to account_statement_import_txt_xlsx/i18n/nl.po diff --git a/account_bank_statement_import_txt_xlsx/i18n/zh_CN.po b/account_statement_import_txt_xlsx/i18n/zh_CN.po similarity index 100% rename from account_bank_statement_import_txt_xlsx/i18n/zh_CN.po rename to account_statement_import_txt_xlsx/i18n/zh_CN.po diff --git a/account_statement_import_txt_xlsx/models/__init__.py b/account_statement_import_txt_xlsx/models/__init__.py new file mode 100644 index 0000000000..af86f7c78a --- /dev/null +++ b/account_statement_import_txt_xlsx/models/__init__.py @@ -0,0 +1,6 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import account_statement_import_sheet_mapping +from . import account_statement_import_sheet_parser +from . import account_statement_import +from . import account_journal diff --git a/account_bank_statement_import_txt_xlsx/models/account_journal.py b/account_statement_import_txt_xlsx/models/account_journal.py similarity index 88% rename from account_bank_statement_import_txt_xlsx/models/account_journal.py rename to account_statement_import_txt_xlsx/models/account_journal.py index a2e49d2263..b6c3f86c38 100644 --- a/account_bank_statement_import_txt_xlsx/models/account_journal.py +++ b/account_statement_import_txt_xlsx/models/account_journal.py @@ -9,7 +9,7 @@ class AccountJournal(models.Model): _inherit = "account.journal" default_sheet_mapping_id = fields.Many2one( - comodel_name="account.bank.statement.import.sheet.mapping", + comodel_name="account.statement.import.sheet.mapping", ) def _get_bank_statements_available_import_formats(self): diff --git a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import.py b/account_statement_import_txt_xlsx/models/account_statement_import.py similarity index 76% rename from account_bank_statement_import_txt_xlsx/models/account_bank_statement_import.py rename to account_statement_import_txt_xlsx/models/account_statement_import.py index 19df908ea9..709d0a8835 100644 --- a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import.py +++ b/account_statement_import_txt_xlsx/models/account_statement_import.py @@ -9,7 +9,7 @@ class AccountBankStatementImport(models.TransientModel): - _inherit = "account.bank.statement.import" + _inherit = "account.statement.import" def _get_default_mapping_id(self): return ( @@ -20,17 +20,17 @@ def _get_default_mapping_id(self): sheet_mapping_id = fields.Many2one( string="Sheet mapping", - comodel_name="account.bank.statement.import.sheet.mapping", + comodel_name="account.statement.import.sheet.mapping", default=_get_default_mapping_id, ) def _parse_file(self, data_file): self.ensure_one() try: - Parser = self.env["account.bank.statement.import.sheet.parser"] + Parser = self.env["account.statement.import.sheet.parser"] return Parser.parse(data_file, self.sheet_mapping_id) except BaseException: - if self.env.context.get("account_bank_statement_import_txt_xlsx_test"): + if self.env.context.get("account_statement_import_txt_xlsx_test"): raise _logger.warning("Sheet parser error", exc_info=True) return super()._parse_file(data_file) diff --git a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_mapping.py b/account_statement_import_txt_xlsx/models/account_statement_import_sheet_mapping.py similarity index 99% rename from account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_mapping.py rename to account_statement_import_txt_xlsx/models/account_statement_import_sheet_mapping.py index bec696c387..6d4dfd628d 100644 --- a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_mapping.py +++ b/account_statement_import_txt_xlsx/models/account_statement_import_sheet_mapping.py @@ -6,7 +6,7 @@ class AccountBankStatementImportSheetMapping(models.Model): - _name = "account.bank.statement.import.sheet.mapping" + _name = "account.statement.import.sheet.mapping" _description = "Account Bank Statement Import Sheet Mapping" name = fields.Char( diff --git a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_parser.py b/account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py similarity index 99% rename from account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_parser.py rename to account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py index c92c9168e5..130964e9fd 100644 --- a/account_bank_statement_import_txt_xlsx/models/account_bank_statement_import_sheet_parser.py +++ b/account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py @@ -22,7 +22,7 @@ class AccountBankStatementImportSheetParser(models.TransientModel): - _name = "account.bank.statement.import.sheet.parser" + _name = "account.statement.import.sheet.parser" _description = "Account Bank Statement Import Sheet Parser" @api.model diff --git a/account_bank_statement_import_txt_xlsx/readme/CONFIGURE.rst b/account_statement_import_txt_xlsx/readme/CONFIGURE.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/readme/CONFIGURE.rst rename to account_statement_import_txt_xlsx/readme/CONFIGURE.rst diff --git a/account_bank_statement_import_txt_xlsx/readme/CONTRIBUTORS.rst b/account_statement_import_txt_xlsx/readme/CONTRIBUTORS.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/readme/CONTRIBUTORS.rst rename to account_statement_import_txt_xlsx/readme/CONTRIBUTORS.rst diff --git a/account_bank_statement_import_txt_xlsx/readme/DESCRIPTION.rst b/account_statement_import_txt_xlsx/readme/DESCRIPTION.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/readme/DESCRIPTION.rst rename to account_statement_import_txt_xlsx/readme/DESCRIPTION.rst diff --git a/account_bank_statement_import_txt_xlsx/readme/HISTORY.rst b/account_statement_import_txt_xlsx/readme/HISTORY.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/readme/HISTORY.rst rename to account_statement_import_txt_xlsx/readme/HISTORY.rst diff --git a/account_bank_statement_import_txt_xlsx/readme/USAGE.rst b/account_statement_import_txt_xlsx/readme/USAGE.rst similarity index 100% rename from account_bank_statement_import_txt_xlsx/readme/USAGE.rst rename to account_statement_import_txt_xlsx/readme/USAGE.rst diff --git a/account_statement_import_txt_xlsx/security/ir.model.access.csv b/account_statement_import_txt_xlsx/security/ir.model.access.csv new file mode 100644 index 0000000000..2880141135 --- /dev/null +++ b/account_statement_import_txt_xlsx/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_account_statement_import_sheet_mapping_wizard","Full access on account.statement.import.sheet.mapping.wizard","model_account_statement_import_sheet_mapping_wizard","account.group_account_user",1,1,1,1 diff --git a/account_bank_statement_import_txt_xlsx/static/description/icon.png b/account_statement_import_txt_xlsx/static/description/icon.png similarity index 100% rename from account_bank_statement_import_txt_xlsx/static/description/icon.png rename to account_statement_import_txt_xlsx/static/description/icon.png diff --git a/account_bank_statement_import_txt_xlsx/static/description/index.html b/account_statement_import_txt_xlsx/static/description/index.html similarity index 100% rename from account_bank_statement_import_txt_xlsx/static/description/index.html rename to account_statement_import_txt_xlsx/static/description/index.html diff --git a/account_bank_statement_import_txt_xlsx/tests/__init__.py b/account_statement_import_txt_xlsx/tests/__init__.py similarity index 53% rename from account_bank_statement_import_txt_xlsx/tests/__init__.py rename to account_statement_import_txt_xlsx/tests/__init__.py index 3073e38a98..426d68385d 100644 --- a/account_bank_statement_import_txt_xlsx/tests/__init__.py +++ b/account_statement_import_txt_xlsx/tests/__init__.py @@ -1,3 +1,3 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import test_account_bank_statement_import_txt_xlsx +from . import test_account_statement_import_txt_xlsx diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/balance.csv b/account_statement_import_txt_xlsx/tests/fixtures/balance.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/balance.csv rename to account_statement_import_txt_xlsx/tests/fixtures/balance.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/debit_credit.csv b/account_statement_import_txt_xlsx/tests/fixtures/debit_credit.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/debit_credit.csv rename to account_statement_import_txt_xlsx/tests/fixtures/debit_credit.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.csv b/account_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.csv rename to account_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.xlsx b/account_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.xlsx similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.xlsx rename to account_statement_import_txt_xlsx/tests/fixtures/empty_statement_en.xlsx diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/multi_currency.csv b/account_statement_import_txt_xlsx/tests/fixtures/multi_currency.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/multi_currency.csv rename to account_statement_import_txt_xlsx/tests/fixtures/multi_currency.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/original_currency.csv b/account_statement_import_txt_xlsx/tests/fixtures/original_currency.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/original_currency.csv rename to account_statement_import_txt_xlsx/tests/fixtures/original_currency.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/original_currency_empty.csv b/account_statement_import_txt_xlsx/tests/fixtures/original_currency_empty.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/original_currency_empty.csv rename to account_statement_import_txt_xlsx/tests/fixtures/original_currency_empty.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.csv b/account_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.csv similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.csv rename to account_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.csv diff --git a/account_bank_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.xlsx b/account_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.xlsx similarity index 100% rename from account_bank_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.xlsx rename to account_statement_import_txt_xlsx/tests/fixtures/sample_statement_en.xlsx diff --git a/account_bank_statement_import_txt_xlsx/tests/test_account_bank_statement_import_txt_xlsx.py b/account_statement_import_txt_xlsx/tests/test_account_statement_import_txt_xlsx.py similarity index 93% rename from account_bank_statement_import_txt_xlsx/tests/test_account_bank_statement_import_txt_xlsx.py rename to account_statement_import_txt_xlsx/tests/test_account_statement_import_txt_xlsx.py index fe009b062a..2c3f99d4e0 100644 --- a/account_bank_statement_import_txt_xlsx/tests/test_account_bank_statement_import_txt_xlsx.py +++ b/account_statement_import_txt_xlsx/tests/test_account_statement_import_txt_xlsx.py @@ -18,16 +18,16 @@ def setUp(self): self.currency_eur = self.env.ref("base.EUR") self.currency_usd = self.env.ref("base.USD") self.sample_statement_map = self.env.ref( - "account_bank_statement_import_txt_xlsx.sample_statement_map" + "account_statement_import_txt_xlsx.sample_statement_map" ) self.AccountJournal = self.env["account.journal"] - self.AccountBankStatement = self.env["account.bank.statement"] - self.AccountBankStatementImport = self.env["account.bank.statement.import"] + self.AccountBankStatement = self.env["account.statement"] + self.AccountBankStatementImport = self.env["account.statement.import"] self.AccountBankStatementImportSheetMapping = self.env[ - "account.bank.statement.import.sheet.mapping" + "account.statement.import.sheet.mapping" ] self.AccountBankStatementImportSheetMappingWizard = self.env[ - "account.bank.statement.import.sheet.mapping.wizard" + "account.statement.import.sheet.mapping.wizard" ] def _data_file(self, filename, encoding=None): @@ -59,7 +59,7 @@ def test_import_csv_file(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -87,7 +87,7 @@ def test_import_empty_csv_file(self): ) with self.assertRaises(UserError): wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 0) @@ -113,7 +113,7 @@ def test_import_xlsx_file(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -141,7 +141,7 @@ def test_import_empty_xlsx_file(self): ) with self.assertRaises(UserError): wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 0) @@ -213,7 +213,7 @@ def test_original_currency(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -248,7 +248,7 @@ def test_original_currency_empty(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -286,7 +286,7 @@ def test_multi_currency(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -324,7 +324,7 @@ def test_balance(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) @@ -364,7 +364,7 @@ def test_debit_credit(self): } ) wizard.with_context( - account_bank_statement_import_txt_xlsx_test=True + account_statement_import_txt_xlsx_test=True ).import_file() statement = self.AccountBankStatement.search([("journal_id", "=", journal.id)]) self.assertEqual(len(statement), 1) diff --git a/account_bank_statement_import_txt_xlsx/views/account_journal_views.xml b/account_statement_import_txt_xlsx/views/account_journal_views.xml similarity index 100% rename from account_bank_statement_import_txt_xlsx/views/account_journal_views.xml rename to account_statement_import_txt_xlsx/views/account_journal_views.xml diff --git a/account_bank_statement_import_txt_xlsx/views/account_bank_statement_import.xml b/account_statement_import_txt_xlsx/views/account_statement_import.xml similarity index 66% rename from account_bank_statement_import_txt_xlsx/views/account_bank_statement_import.xml rename to account_statement_import_txt_xlsx/views/account_statement_import.xml index 65d0cd1a41..4ef359aa77 100644 --- a/account_bank_statement_import_txt_xlsx/views/account_bank_statement_import.xml +++ b/account_statement_import_txt_xlsx/views/account_statement_import.xml @@ -5,12 +5,12 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - - account.bank.statement.import - account.bank.statement.import + + account.statement.import + account.statement.import diff --git a/account_bank_statement_import_txt_xlsx/views/account_bank_statement_import_sheet_mapping.xml b/account_statement_import_txt_xlsx/views/account_statement_import_sheet_mapping.xml similarity index 85% rename from account_bank_statement_import_txt_xlsx/views/account_bank_statement_import_sheet_mapping.xml rename to account_statement_import_txt_xlsx/views/account_statement_import_sheet_mapping.xml index 5caa5b122b..8f9718b5a3 100644 --- a/account_bank_statement_import_txt_xlsx/views/account_bank_statement_import_sheet_mapping.xml +++ b/account_statement_import_txt_xlsx/views/account_statement_import_sheet_mapping.xml @@ -5,18 +5,18 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - - account.bank.statement.import.sheet.mapping.form - account.bank.statement.import.sheet.mapping + + account.statement.import.sheet.mapping.form + account.statement.import.sheet.mapping - - account.bank.statement.import.sheet.mapping.tree - account.bank.statement.import.sheet.mapping + + account.statement.import.sheet.mapping.tree + account.statement.import.sheet.mapping
@@ -77,7 +77,7 @@ model="ir.actions.act_window" > Statement Sheet Mappings - account.bank.statement.import.sheet.mapping + account.statement.import.sheet.mapping tree,form account.bank.statement.import.sheet.mapping.wizard.form - account.bank.statement.import.sheet.mapping.wizard + >account.statement.import.sheet.mapping.wizard.form + account.statement.import.sheet.mapping.wizard primary @@ -152,10 +152,10 @@ diff --git a/setup/account_bank_statement_import_txt_xlsx/odoo/addons/account_bank_statement_import_txt_xlsx b/setup/account_bank_statement_import_txt_xlsx/odoo/addons/account_bank_statement_import_txt_xlsx deleted file mode 120000 index 389054001a..0000000000 --- a/setup/account_bank_statement_import_txt_xlsx/odoo/addons/account_bank_statement_import_txt_xlsx +++ /dev/null @@ -1 +0,0 @@ -../../../../account_bank_statement_import_txt_xlsx \ No newline at end of file diff --git a/setup/account_statement_import_txt_xlsx/odoo/addons/account_statement_import_txt_xlsx b/setup/account_statement_import_txt_xlsx/odoo/addons/account_statement_import_txt_xlsx new file mode 120000 index 0000000000..036eee8c78 --- /dev/null +++ b/setup/account_statement_import_txt_xlsx/odoo/addons/account_statement_import_txt_xlsx @@ -0,0 +1 @@ +../../../../account_statement_import_txt_xlsx \ No newline at end of file diff --git a/setup/account_bank_statement_import_txt_xlsx/setup.py b/setup/account_statement_import_txt_xlsx/setup.py similarity index 100% rename from setup/account_bank_statement_import_txt_xlsx/setup.py rename to setup/account_statement_import_txt_xlsx/setup.py