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

[FIX] Account: Default value for journal in invoices not taken into account => https://bugs.launchpad.net/openobject-addons/+bug/699771 

lp bug: https://launchpad.net/bugs/699771 fixed

bzr revid: mra@mra-laptop-20110110114741-6hicj8ee0z6co2rn
This commit is contained in:
Mustufa Rangwala 2011-01-10 17:17:41 +05:30
parent 4e21b7d724
commit 59d50f767f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/invoice.py
View File

@ -541,7 +541,11 @@ class account_invoice(osv.osv):
journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
if journal_ids:
val['journal_id'] = journal_ids[0]
else:
res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['account.invoice'])
for r in res_journal_default:
if r[1] == 'journal_id' and r[2] in journal_ids:
val['journal_id'] = r[2]
if not val.get('journal_id', False):
raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
dom = {'journal_id': [('id', 'in', journal_ids)]}
else:
@ -559,7 +563,6 @@ class account_invoice(osv.osv):
val['currency_id'] = False
else:
val['currency_id'] = company.currency_id.id
return {'value': val, 'domain': dom}
# go from canceled state to draft state