[MERGE] forward port of branch 7.0 up to 11cd8ba

This commit is contained in:
Christophe Simonis 2015-08-14 16:02:31 +02:00
commit e95e9f8878
1 changed files with 3 additions and 2 deletions

View File

@ -69,7 +69,8 @@ class bank(osv.osv):
# No liquidity account exists, no template available
if not ids: continue
ref_acc_bank = obj_acc.browse(cr, uid, ids[0], context=context).parent_id
sibbling_acc_bank = obj_acc.browse(cr, uid, ids[0], context=context)
ref_acc_bank = sibbling_acc_bank.parent_id
while True:
new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
@ -81,7 +82,7 @@ class bank(osv.osv):
'name': name,
'code': new_code,
'type': 'liquidity',
'user_type': ref_acc_bank.user_type.id,
'user_type': sibbling_acc_bank.user_type.id,
'reconcile': False,
'parent_id': ref_acc_bank.id,
'company_id': bank.company_id.id,