Merge pull request #124 from hbrunn/8.0-camt-abstract-model

backport #110 - CAMT parser as AbstractModel

account_bank_statement_import_camt/__init__.py

@@ -1 +1 @@
-from . import account_bank_statement_import
+from . import models

account_bank_statement_import_camt/models/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import parser
+from . import account_bank_statement_import

account_bank_statement_import_camt/account_bank_statement_import.py → account_bank_statement_import_camt/models/account_bank_statement_import.py

@@ -20,8 +20,6 @@
 ##############################################################################
 import logging
 from openerp import models
-from .camt import CamtParser as Parser
-
 
 _logger = logging.getLogger(__name__)
 
@@ -32,7 +30,7 @@ class AccountBankStatementImport(models.TransientModel):
 
     def _parse_file(self, cr, uid, data_file, context=None):
         """Parse a CAMT053 XML file."""
-        parser = Parser()
+        parser = self.pool['account.bank.statement.import.camt.parser']
         try:
             _logger.debug("Try parsing with camt.")
             return parser.parse(data_file)

account_bank_statement_import_camt/camt.py → account_bank_statement_import_camt/models/parser.py

@@ -30,8 +30,11 @@ from openerp import _
 from openerp.addons.account_bank_statement_import.parserlib import (
     BankStatement)
 
+from openerp import models
 
-class CamtParser(object):
+
+class CamtParser(models.AbstractModel):
+    _name = 'account.bank.statement.import.camt.parser'
     """Parser for camt bank statement import files."""
 
     def parse_amount(self, ns, node):