From 939c82b1d56a56417068fefa6e0d30437fff8129 Mon Sep 17 00:00:00 2001 From: James Jesudason Date: Tue, 17 Apr 2012 12:11:43 +0100 Subject: [PATCH 1/2] [FIX] IBAN validation for Italian bank accounts is wrong and is preventing valid accounts from being added. Validation removed for Italian accounts. Need to find a long-term solution to IBAN validation as the current code is rejecting valid numbers for a number of countries. --- account_banking/sepa/iban.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_banking/sepa/iban.py b/account_banking/sepa/iban.py index 19c09b736..b6bdb1430 100644 --- a/account_banking/sepa/iban.py +++ b/account_banking/sepa/iban.py @@ -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'), From 1bb35ef5c3f28cf212eaff4e7acc4d224a142ce4 Mon Sep 17 00:00:00 2001 From: James Jesudason Date: Mon, 30 Apr 2012 18:11:56 +0100 Subject: [PATCH 2/2] [FIX] Change to the error handling on multi-line HSBC bank statement transacions. --- account_banking_uk_hsbc/hsbc_mt940.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/account_banking_uk_hsbc/hsbc_mt940.py b/account_banking_uk_hsbc/hsbc_mt940.py index 6f516581f..fc3dd65fd 100644 --- a/account_banking_uk_hsbc/hsbc_mt940.py +++ b/account_banking_uk_hsbc/hsbc_mt940.py @@ -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):