From 81310fb8ffa3dca337db3a790f2b24213037a55c Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 9 Apr 2013 10:27:02 +0200 Subject: [PATCH] [FIX] Import from openerp.addons [FIX] res_partner_bank's _founder is a class, not an instance [FIX] base_iban does not override search() anymore --- account_banking/account_banking.py | 13 ++++++------- account_banking/wizard/banktools.py | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/account_banking/account_banking.py b/account_banking/account_banking.py index 754096b94..91be18ebb 100644 --- a/account_banking/account_banking.py +++ b/account_banking/account_banking.py @@ -622,7 +622,7 @@ class res_partner_bank(orm.Model): or vals.get('acc_number_domestic', False)) vals['acc_number'], vals['acc_number_domestic'] = ( self._correct_IBAN(iban)) - return self._founder.create(cursor, uid, vals, context) + return self._founder.create(self, cursor, uid, vals, context) def write(self, cr, uid, ids, vals, context=None): ''' @@ -642,7 +642,7 @@ class res_partner_bank(orm.Model): self._correct_IBAN(account['acc_number'])) else: vals['acc_number_domestic'] = False - self._founder.write(cr, uid, account['id'], vals, context) + self._founder.write(self, cr, uid, account['id'], vals, context) return True def search(self, cursor, uid, args, *rest, **kwargs): @@ -704,10 +704,9 @@ class res_partner_bank(orm.Model): # Extend search filter newargs = extended_search_expression(args) - # Original search (_founder) - results = self._founder.search(cursor, uid, newargs, - *rest, **kwargs - ) + # Original search + results = super(res_partner_bank, self).search( + self, cursor, uid, newargs, *rest, **kwargs) return results def read( @@ -718,7 +717,7 @@ class res_partner_bank(orm.Model): ''' if fields and 'state' not in fields: fields.append('state') - records = self._founder.read(cr, uid, ids, fields, context, load) + records = self._founder.read(self, cr, uid, ids, fields, context, load) is_list = True if not isinstance(records, list): records = [records,] diff --git a/account_banking/wizard/banktools.py b/account_banking/wizard/banktools.py index 814c4e032..f817f610a 100644 --- a/account_banking/wizard/banktools.py +++ b/account_banking/wizard/banktools.py @@ -20,10 +20,10 @@ ############################################################################## import datetime -from tools.translate import _ -from account_banking.parsers import convert -from account_banking import sepa -from account_banking.struct import struct +from openerp.tools.translate import _ +from openerp.addons.account_banking.parsers import convert +from openerp.addons.account_banking import sepa +from openerp.addons.account_banking.struct import struct __all__ = [ 'get_period',