[MRG] Merged with main development branch

This commit is contained in:
Stefan Rijnhart
2012-05-01 12:00:19 +02:00
2 changed files with 7 additions and 7 deletions

View File

@@ -219,7 +219,7 @@ class IBAN(str):
# Iceland uses an extra identification number, split in two on
# display. Coded here as %P%V.
'IS': BBANFormat('CCCCTTAAAAAAPPPPPPVVVV', '%C-%T-%A-%P-%V'),
'IT': BBANFormat('WBBBBBCCCCCCAAAAAAAAAAAAV', '%W/%B/%C/%A%V'),
#'IT': BBANFormat('WBBBBBCCCCCCAAAAAAAAAAAAV', '%W/%B/%C/%A%V'),
'LV': BBANFormat('BBBBAAAAAAAAAAAAA', '%I'),
'LI': BBANFormat('CCCCCAAAAAAAAAAAA', '%C %A', nolz=True),
'LT': BBANFormat('BBBBBAAAAAAAAAAA', '%I'),

View File

@@ -128,14 +128,14 @@ class statement(models.mem_bank_statement):
'''
# Additional information for previous transaction
if len(self.transactions) < 1:
raise_error('Received additional information for non existent transaction', record)
transaction = self.transactions[-1]
transaction.id = ','.join([record[k] for k in ['infoline{0}'.format(i) for i in range(2,5)] if record.has_key(k)])
logger.info("Received additional information for non existent transaction:")
logger.info(record)
else:
transaction = self.transactions[-1]
transaction.id = ','.join([record[k] for k in ['infoline{0}'.format(i) for i in range(2,5)] if record.has_key(k)])
def raise_error(message, line):
raise osv.except_osv(_('Import error'),
raise osv.osv.except_osv(_('Import error'),
'Error in import:%s\n\n%s' % (message, line))
class parser_hsbc_mt940(models.parser):