diff --git a/__manifest__.py b/__manifest__.py index e4d13667164da2caec0fe4ddb96bba605268a923..b68b35a09072bb0a50e9643de56a73b6a2d1a3a8 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -2,7 +2,7 @@ { 'name': 'Import BPCE Bank Statement', 'category': 'Banking addons', - 'version': '12.0.1.0.0', + 'version': '14.0.1.0.0', 'license': 'AGPL-3', 'author': 'Odoo SA,' 'Akretion,' @@ -14,7 +14,7 @@ 'Le Filament', 'website': 'https://odoo-community.org/', 'depends': [ - 'account_bank_statement_import', + 'account_statement_import', ], 'data': [ 'views/view_account_bank_statement_import.xml', diff --git a/models/account_journal.py b/models/account_journal.py index 6c653c4bb0aae3936a6af838e98bd65d7fc48ffc..8c53b20d0c72f3765dc0331f064fa7d35fff3fa3 100644 --- a/models/account_journal.py +++ b/models/account_journal.py @@ -5,10 +5,7 @@ class AccountJournal(models.Model): _inherit = "account.journal" def _get_bank_statements_available_import_formats(self): - """ Adds bpce to supported import formats. - """ - rslt = super( - AccountJournal, - self)._get_bank_statements_available_import_formats() + """Adds ofx to supported import formats.""" + rslt = super()._get_bank_statements_available_import_formats() rslt.append('bpce') return rslt diff --git a/views/view_account_bank_statement_import.xml b/views/view_account_bank_statement_import.xml index 6b8bdd6ba8d8edb9435aa115a27baf69db4c71fe..656c914fd6b354da9c6450e01a7ceb7220a34ce2 100644 --- a/views/view_account_bank_statement_import.xml +++ b/views/view_account_bank_statement_import.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <record id="view_account_bank_statement_import_form" model="ir.ui.view"> - <field name="model">account.bank.statement.import</field> - <field name="inherit_id" ref="account_bank_statement_import.account_bank_statement_import_view"/> + <field name="model">account.statement.import</field> + <field name="inherit_id" ref="account_statement_import.account_statement_import_form"/> <field name="arch" type="xml"> <xpath expr="//ul[@id='statement_format']" position="inside"> <li>BPCE CSV File (.CSV)</li> diff --git a/wizard/account_bank_statement_import.py b/wizard/account_bank_statement_import.py index be103d26baab414750c57687cf129443e7678a6e..7eca6bd5c22fe26c803ee836fc3918dbd714faf3 100644 --- a/wizard/account_bank_statement_import.py +++ b/wizard/account_bank_statement_import.py @@ -11,7 +11,7 @@ _logger = logging.getLogger(__name__) class AccountBankStatementImport(models.TransientModel): - _inherit = 'account.bank.statement.import' + _inherit = 'account.statement.import' regexp_version = { 'version_A' : { @@ -95,7 +95,7 @@ class AccountBankStatementImport(models.TransientModel): data_file_split = data_file.decode('iso-8859-1').splitlines() result = self._check_file(data_file_split) if not result: - return super(AccountBankStatementImport, self)._parse_file( + return super(AccountStatementImport, self)._parse_file( data_file) file_version, bank_group_code, openning_date, closing_date, bank_account_number, opening_balance, closing_balance, currency = result