From 27c4f49cf1955b382fe980c8a66acc424c777622 Mon Sep 17 00:00:00 2001 From: "Pieter J. Kersten" Date: Tue, 9 Mar 2010 17:15:44 +0100 Subject: [PATCH] [FIX] account_banking: invalid definition of method [FIX] account_banking: removed unused configuration class [IMP] account_banking_nl_multibank: added sanity check on columns parsed --- account_banking/account_banking.py | 19 ------------------- account_banking/wizard/bank_import.py | 2 +- account_banking_nl_multibank/multibank.py | 4 ++++ 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/account_banking/account_banking.py b/account_banking/account_banking.py index 4862988be..7cd97d723 100644 --- a/account_banking/account_banking.py +++ b/account_banking/account_banking.py @@ -64,25 +64,6 @@ from tools.translate import _ from wizard.banktools import get_or_create_bank import pooler -class account_banking_settings(osv.osv): - '''Settings for the account_banking module''' - _name = 'account.banking.settings' - _description = __doc__ - _columns = { - 'use_online': fields.boolean('Online Sources', - help=('Select this if you want to be ' - 'able to use the online banking ' - 'resources from the internet ' - 'to auto complete account and ' - 'bank info.') - ), - } - _defaults = { - 'use_online': lambda *a: True, - } - -account_banking_settings() - class account_banking_account_settings(osv.osv): '''Default Journal for Bank Account''' _name = 'account.banking.account.settings' diff --git a/account_banking/wizard/bank_import.py b/account_banking/wizard/bank_import.py index 64aba7535..cec5043d7 100644 --- a/account_banking/wizard/bank_import.py +++ b/account_banking/wizard/bank_import.py @@ -99,7 +99,7 @@ class banking_import(wizard.interface): def _fill_results(self, *args, **kwargs): return {'log': self._log} - def _get_move_info(cursor, uid, move_line): + def _get_move_info(self, cursor, uid, move_line): reconcile_obj = self.pool.get('account.bank.statement.reconcile') type_map = { 'out_invoice': 'customer', diff --git a/account_banking_nl_multibank/multibank.py b/account_banking_nl_multibank/multibank.py index e5ab19d46..2e23f1e00 100644 --- a/account_banking_nl_multibank/multibank.py +++ b/account_banking_nl_multibank/multibank.py @@ -69,6 +69,10 @@ class transaction_message(object): ''' Initialize own dict with attributes and coerce values to right type ''' + if len(self.attrnames) != len(values): + raise ValueError, \ + _('Invalid transaction line: expected %d columns, found %d') \ + % (len(self.attrnames), len(values)) self.__dict__.update(dict(zip(self.attrnames, values))) #self.local_account = self.clean_account(self.local_account) #self.remote_account = self.clean_account(self.remote_account)