Skip to content

Commit

Permalink
[MIG] account_bank_statement_import_txt_xlsx: Migration to 14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
primes2h committed Sep 10, 2021
1 parent 114a1b5 commit 479c604
Show file tree
Hide file tree
Showing 42 changed files with 63 additions and 64 deletions.
6 changes: 0 additions & 6 deletions account_bank_statement_import_txt_xlsx/models/__init__.py

This file was deleted.

This file was deleted.

Expand Up @@ -5,25 +5,25 @@
{
"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)",
"maintainers": ["alexey-pelykh"],
"license": "AGPL-3",
"installable": True,
"depends": [
"account_bank_statement_import",
"account_statement_import",
"multi_step_wizard",
"web_widget_dropdown_dynamic",
],
"external_dependencies": {"python": ["xlrd"]},
"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",
],
}
Expand Up @@ -7,7 +7,7 @@
<odoo noupdate="1">
<record
id="sample_statement_map"
model="account.bank.statement.import.sheet.mapping"
model="account.statement.import.sheet.mapping"
>
<field name="name">Sample Statement</field>
<field name="float_thousands_sep">comma</field>
Expand Down
6 changes: 6 additions & 0 deletions 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
Expand Up @@ -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):
Expand Down
Expand Up @@ -9,7 +9,7 @@


class AccountBankStatementImport(models.TransientModel):
_inherit = "account.bank.statement.import"
_inherit = "account.statement.import"

def _get_default_mapping_id(self):
return (
Expand All @@ -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)
Expand Up @@ -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(
Expand Down
Expand Up @@ -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
Expand Down
@@ -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
@@ -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
Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Expand Up @@ -5,12 +5,12 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="account_bank_statement_import_view" model="ir.ui.view">
<field name="name">account.bank.statement.import</field>
<field name="model">account.bank.statement.import</field>
<record id="account_statement_import_form" model="ir.ui.view">
<field name="name">account.statement.import</field>
<field name="model">account.statement.import</field>
<field
name="inherit_id"
ref="account_bank_statement_import.account_bank_statement_import_view"
ref="account_statement_import.account_statement_import_form"
/>
<field name="arch" type="xml">
<xpath expr="//ul[@id='statement_format']" position="inside">
Expand Down
Expand Up @@ -5,18 +5,18 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="account_bank_statement_import_sheet_mapping_form" model="ir.ui.view">
<field name="name">account.bank.statement.import.sheet.mapping.form</field>
<field name="model">account.bank.statement.import.sheet.mapping</field>
<record id="account_statement_import_sheet_mapping_form" model="ir.ui.view">
<field name="name">account.statement.import.sheet.mapping.form</field>
<field name="model">account.statement.import.sheet.mapping</field>
<field name="arch" type="xml">
<tree>
<field name="name" />
</tree>
</field>
</record>
<record id="account_bank_statement_import_sheet_mapping_tree" model="ir.ui.view">
<field name="name">account.bank.statement.import.sheet.mapping.tree</field>
<field name="model">account.bank.statement.import.sheet.mapping</field>
<record id="account_statement_import_sheet_mapping_tree" model="ir.ui.view">
<field name="name">account.statement.import.sheet.mapping.tree</field>
<field name="model">account.statement.import.sheet.mapping</field>
<field name="arch" type="xml">
<form>
<sheet>
Expand Down Expand Up @@ -77,7 +77,7 @@
model="ir.actions.act_window"
>
<field name="name">Statement Sheet Mappings</field>
<field name="res_model">account.bank.statement.import.sheet.mapping</field>
<field name="res_model">account.statement.import.sheet.mapping</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
Expand Down
@@ -1,3 +1,3 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from . import account_bank_statement_import_sheet_mapping_wizard
from . import account_statement_import_sheet_mapping_wizard
Expand Up @@ -10,15 +10,15 @@


class AccountBankStatementImportSheetMappingWizard(models.TransientModel):
_name = "account.bank.statement.import.sheet.mapping.wizard"
_name = "account.statement.import.sheet.mapping.wizard"
_description = "Account Bank Statement Import Sheet Mapping Wizard"
_inherit = ["multi.step.wizard.mixin"]

attachment_ids = fields.Many2many(
comodel_name="ir.attachment",
string="Files",
required=True,
relation="account_bank_statement_import_sheet_mapping_wiz_attachment_rel",
relation="account_statement_import_sheet_mapping_wiz_attachment_rel",
)
header = fields.Char()
file_encoding = fields.Selection(
Expand Down Expand Up @@ -111,23 +111,23 @@ class AccountBankStatementImportSheetMappingWizard(models.TransientModel):
@api.model
def _selection_file_encoding(self):
return (
self.env["account.bank.statement.import.sheet.mapping"]
self.env["account.statement.import.sheet.mapping"]
._fields["file_encoding"]
.selection
)

@api.model
def _selection_delimiter(self):
return (
self.env["account.bank.statement.import.sheet.mapping"]
self.env["account.statement.import.sheet.mapping"]
._fields["delimiter"]
.selection
)

@api.onchange("attachment_ids")
def _onchange_attachment_ids(self):
Parser = self.env["account.bank.statement.import.sheet.parser"]
Mapping = self.env["account.bank.statement.import.sheet.mapping"]
Parser = self.env["account.statement.import.sheet.parser"]
Mapping = self.env["account.statement.import.sheet.mapping"]
if not self.attachment_ids:
return
csv_options = {}
Expand Down Expand Up @@ -184,13 +184,13 @@ def _get_mapping_values(self):

def import_mapping(self):
self.ensure_one()
mapping = self.env["account.bank.statement.import.sheet.mapping"].create(
mapping = self.env["account.statement.import.sheet.mapping"].create(
self._get_mapping_values()
)
return {
"type": "ir.actions.act_window",
"name": _("Imported Mapping"),
"res_model": "account.bank.statement.import.sheet.mapping",
"res_model": "account.statement.import.sheet.mapping",
"res_id": mapping.id,
"view_mode": "form",
"view_id": False,
Expand Down
Expand Up @@ -6,13 +6,13 @@
-->
<odoo>
<record
id="account_bank_statement_import_sheet_mapping_wizard_form"
id="account_statement_import_sheet_mapping_wizard_form"
model="ir.ui.view"
>
<field
name="name"
>account.bank.statement.import.sheet.mapping.wizard.form</field>
<field name="model">account.bank.statement.import.sheet.mapping.wizard</field>
>account.statement.import.sheet.mapping.wizard.form</field>
<field name="model">account.statement.import.sheet.mapping.wizard</field>
<field name="mode">primary</field>
<field name="inherit_id" ref="multi_step_wizard.multi_step_wizard_form" />
<field name="arch" type="xml">
Expand Down Expand Up @@ -152,10 +152,10 @@
</field>
</record>
<act_window
id="action_account_bank_statement_import_sheet_mapping_wizard"
id="action_account_statement_import_sheet_mapping_wizard"
name="Import Mapping"
res_model="account.bank.statement.import.sheet.mapping.wizard"
binding_model="account.bank.statement.import.sheet.mapping"
res_model="account.statement.import.sheet.mapping.wizard"
binding_model="account.statement.import.sheet.mapping"
view_mode="form"
target="new"
/>
Expand Down

This file was deleted.

0 comments on commit 479c604

Please sign in to comment.