Merge lp:~openerp-dev/openobject-addons/trunk-bug-684119-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

FIX: #684119 Account chart wizard does not check if generated account code for bank journal exsits

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

you have two same code it should be common for both try and except

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

hello,

I have improved code as you describe above.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'account/account.py'
--- account/account.py	2011-03-29 14:30:31 +0000
+++ account/account.py	2011-03-30 06:20:56 +0000
@@ -2924,15 +2924,22 @@
         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)
+                while valid:
+                    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)
+                    ids = obj_acc.search(cr, uid, [('code', '=', new_code)])
+                    if not ids:
+                        valid = False
+                    else:
+                        current_num += 1
             vals = {
                 'name': tmp,
                 'currency_id': line.currency_id and line.currency_id.id or False,
@@ -2965,6 +2972,7 @@
             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')