[FIX] conversion_dict is now created in the generic parser

This commit is contained in:
florian-dacosta
2014-07-23 17:55:39 +02:00
parent 1d1ae5741c
commit 88c5159f52
2 changed files with 10 additions and 10 deletions

View File

@@ -42,7 +42,7 @@ class FileParser(BankStatementImportParser):
""" """
:param char: parse_name: The name of the parser :param char: parse_name: The name of the parser
:param char: ftype: extension of the file (could be csv, xls or xlsx) :param char: ftype: extension of the file (could be csv, xls or xlsx)
:param dict: extra_fields: extra fields to add to the conversion dict. In the format :param dict: extra_fields: extra fields to put into the conversion dict. In the format
{fieldname: fieldtype} {fieldname: fieldtype}
:param list: header : specify header fields if the csv file has no header :param list: header : specify header fields if the csv file has no header
""" """
@@ -53,14 +53,7 @@ class FileParser(BankStatementImportParser):
else: else:
raise except_osv(_('User Error'), raise except_osv(_('User Error'),
_('Invalid file type %s. Please use csv, xls or xlsx') % ftype) _('Invalid file type %s. Please use csv, xls or xlsx') % ftype)
self.conversion_dict = { self.conversion_dict = extra_fields
'ref': unicode,
'label': unicode,
'date': datetime.datetime,
'amount': float_or_zero,
}
if extra_fields:
self.conversion_dict.update(extra_fields)
self.keys_to_validate = self.conversion_dict.keys() self.keys_to_validate = self.conversion_dict.keys()
self.fieldnames = header self.fieldnames = header
self._datemode = 0 # used only for xls documents, self._datemode = 0 # used only for xls documents,

View File

@@ -24,6 +24,7 @@ import csv
import tempfile import tempfile
import datetime import datetime
from file_parser import FileParser from file_parser import FileParser
+from openerp.addons.account_statement_base_import.parser.file_parser import float_or_zero
try: try:
import xlrd import xlrd
except: except:
@@ -38,7 +39,13 @@ class GenericFileParser(FileParser):
""" """
def __init__(self, parse_name, ftype='csv', **kwargs): def __init__(self, parse_name, ftype='csv', **kwargs):
super(GenericFileParser, self).__init__(parse_name, ftype=ftype, **kwargs) conversion_dict = {
'ref': unicode,
'label': unicode,
'date': datetime.datetime,
'amount': float_or_zero,
}
super(GenericFileParser, self).__init__(parse_name, ftype=ftype, extra_fields=conversion_dict, **kwargs)
@classmethod @classmethod
def parser_for(cls, parser_name): def parser_for(cls, parser_name):