fixes spelling, formatting and comparison according to the code review

This commit is contained in:
Laurent Mignon (Acsone)
2013-09-12 10:36:23 +02:00
parent 82ca094948
commit 3cb4e69d22

View File

@@ -27,7 +27,6 @@ from openerp.addons.account_statement_base_completion.statement import ErrorTooM
class AccountStatementCompletionRule(Model): class AccountStatementCompletionRule(Model):
"""Add a rule based on transaction ID""" """Add a rule based on transaction ID"""
_inherit = "account.statement.completion.rule" _inherit = "account.statement.completion.rule"
@@ -36,7 +35,7 @@ class AccountStatementCompletionRule(Model):
res = super(AccountStatementCompletionRule, self)._get_functions( res = super(AccountStatementCompletionRule, self)._get_functions(
cr, uid, context=context) cr, uid, context=context)
res.append(('get_from_bank_account', res.append(('get_from_bank_account',
'From bank account number (Nomal or IBAN)')) 'From bank account number (Normal or IBAN)'))
return res return res
_columns = { _columns = {
@@ -55,18 +54,19 @@ class AccountStatementCompletionRule(Model):
'account_id' : value, 'account_id' : value,
...} ...}
""" """
if st_line['partner_acc_number'] == False: partner_acc_number = st_line['partner_acc_number']
if not partner_acc_number:
return {} return {}
st_obj = self.pool.get('account.bank.statement.line') st_obj = self.pool.get('account.bank.statement.line')
res = {} res = {}
res_bank_obj = self.pool.get('res.partner.bank') res_bank_obj = self.pool.get('res.partner.bank')
ids = res_bank_obj.search(cr, ids = res_bank_obj.search(cr,
uid, uid,
[('acc_number', '=', st_line['partner_acc_number'])], [('acc_number', '=', partner_acc_number)],
context=context) context=context)
if len(ids) > 1: if len(ids) > 1:
raise ErrorTooManyPartner(_('Line named "%s" (Ref:%s) was matched by more than ' raise ErrorTooManyPartner(_('Line named "%s" (Ref:%s) was matched by more than '
'one partner.') % (st_line['name'], st_line['ref'])) 'one partner for account number "%s".') % (st_line['name'], st_line['ref'], partner_acc_number))
if len(ids) == 1: if len(ids) == 1:
partner = res_bank_obj.browse(cr, uid, ids[0], context=context).partner_id partner = res_bank_obj.browse(cr, uid, ids[0], context=context).partner_id
res['partner_id'] = partner.id res['partner_id'] = partner.id
@@ -86,7 +86,7 @@ class AccountStatementLine(Model):
_inherit = "account.bank.statement.line" _inherit = "account.bank.statement.line"
_columns = { _columns = {
# 'additionnal_bank_fields' : fields.serialized('Additionnal infos from bank', help="Used by completion and import system."), # 'additional_bank_fields' : fields.serialized('Additional infos from bank', help="Used by completion and import system."),
'partner_acc_number': fields.sparse( 'partner_acc_number': fields.sparse(
type='char', type='char',
string='Account Number', string='Account Number',