odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] lp:684119 

bzr revid: qdp-launchpad@openerp.com-20110518153258-17ypw1tjibw51wv0
This commit is contained in:
Quentin (OpenERP) 2011-05-18 17:32:58 +02:00
parent c7a066d150 b7452ba8e0
commit 53c973b38a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/account/account.py
View File

@ -2922,15 +2922,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
current_num = 1
valid = True
for line in obj_multi.bank_accounts_id:
#create the account_account for this bank journal
tmp = line.acc_name
dig = obj_multi.code_digits
if ref_acc_bank.code:
try:
new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
except:
new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
if not ref_acc_bank.code:
raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of account hasn\'t a code.'))
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', '=', company_id)])
if not ids:
break
else:
current_num += 1
vals = {
'name': tmp,
'currency_id': line.currency_id and line.currency_id.id or False,
@ -2961,6 +2966,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal['default_debit_account_id'] = acc_cash_id
obj_journal.create(cr, uid, vals_journal)
current_num += 1
valid = True
#create the properties
property_obj = self.pool.get('ir.property')