Browse Source
Merge pull request #130 from CompassionCH/10.0-camt-inheritance
[IMP] account_bank_statement_import_camt: Allow camt parser inheritance
pull/132/head
Pedro M. Baeza
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
8 additions and
6 deletions
-
account_bank_statement_import_camt/__init__.py
-
account_bank_statement_import_camt/__manifest__.py
-
account_bank_statement_import_camt/models/__init__.py
-
account_bank_statement_import_camt/models/account_bank_statement_import.py
-
account_bank_statement_import_camt/models/parser.py
|
@ -2,4 +2,3 @@ |
|
|
# © 2013-2016 Therp BV <http://therp.nl> |
|
|
# © 2013-2016 Therp BV <http://therp.nl> |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
from . import models |
|
|
from . import models |
|
|
from . import camt |
|
|
|
|
@ -1,9 +1,9 @@ |
|
|
# -*- coding: utf-8 -*- |
|
|
# -*- coding: utf-8 -*- |
|
|
# © 2013-2016 Therp BV <http://therp.nl> |
|
|
|
|
|
|
|
|
# © 2013-2017 Therp BV <http://therp.nl> |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
{ |
|
|
{ |
|
|
'name': 'CAMT Format Bank Statements Import', |
|
|
'name': 'CAMT Format Bank Statements Import', |
|
|
'version': '10.0.1.0.0', |
|
|
|
|
|
|
|
|
'version': '10.0.1.1.0', |
|
|
'license': 'AGPL-3', |
|
|
'license': 'AGPL-3', |
|
|
'author': 'Odoo Community Association (OCA), Therp BV', |
|
|
'author': 'Odoo Community Association (OCA), Therp BV', |
|
|
'website': 'https://github.com/OCA/bank-statement-import', |
|
|
'website': 'https://github.com/OCA/bank-statement-import', |
|
|
|
@ -1,4 +1,5 @@ |
|
|
# -*- coding: utf-8 -*- |
|
|
# -*- coding: utf-8 -*- |
|
|
# © 2013-2016 Therp BV <http://therp.nl> |
|
|
# © 2013-2016 Therp BV <http://therp.nl> |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). |
|
|
|
|
|
from . import parser |
|
|
from . import account_bank_statement_import |
|
|
from . import account_bank_statement_import |
|
@ -6,7 +6,6 @@ import logging |
|
|
import StringIO |
|
|
import StringIO |
|
|
import zipfile |
|
|
import zipfile |
|
|
from odoo import api, models |
|
|
from odoo import api, models |
|
|
from ..camt import CamtParser as Parser |
|
|
|
|
|
|
|
|
|
|
|
_logger = logging.getLogger(__name__) |
|
|
_logger = logging.getLogger(__name__) |
|
|
|
|
|
|
|
@ -19,7 +18,7 @@ class AccountBankStatementImport(models.TransientModel): |
|
|
def _parse_file(self, data_file): |
|
|
def _parse_file(self, data_file): |
|
|
"""Parse a CAMT053 XML file.""" |
|
|
"""Parse a CAMT053 XML file.""" |
|
|
try: |
|
|
try: |
|
|
parser = Parser() |
|
|
|
|
|
|
|
|
parser = self.env['account.bank.statement.import.camt.parser'] |
|
|
_logger.debug("Try parsing with camt.") |
|
|
_logger.debug("Try parsing with camt.") |
|
|
return parser.parse(data_file) |
|
|
return parser.parse(data_file) |
|
|
except ValueError: |
|
|
except ValueError: |
|
|
|
@ -5,8 +5,11 @@ |
|
|
import re |
|
|
import re |
|
|
from lxml import etree |
|
|
from lxml import etree |
|
|
|
|
|
|
|
|
|
|
|
from odoo import models |
|
|
|
|
|
|
|
|
class CamtParser(object): |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class CamtParser(models.AbstractModel): |
|
|
|
|
|
_name = 'account.bank.statement.import.camt.parser' |
|
|
"""Parser for camt bank statement import files.""" |
|
|
"""Parser for camt bank statement import files.""" |
|
|
|
|
|
|
|
|
def parse_amount(self, ns, node): |
|
|
def parse_amount(self, ns, node): |