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

[FIX] account: partial revert of commit 6465. Put back the default value on currency field but changed its implementation in order to have it computed thanks to the default journal 

bzr revid: qdp-launchpad@openerp.com-20120201160648-kei7wp4radcws0p9
This commit is contained in:
Quentin (OpenERP) 2012-02-01 17:06:48 +01:00
parent 5e7b30e996
commit 1928854809
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/account/account_invoice.py
View File

@ -57,6 +57,14 @@ class account_invoice(osv.osv):
limit=1)
return res and res[0] or False
def _get_currency(self, cr, uid, context=None):
res = False
journal_id = self._get_journal(cr, uid, context=context)
if journal_id:
journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
res = journal.currency and journal.currency.id or journal.company_id.currency_id.id
return res
def _get_journal_analytic(self, cr, uid, type_inv, context=None):
type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
tt = type2journal.get(type_inv, 'sale')
@ -273,6 +281,7 @@ class account_invoice(osv.osv):
'type': _get_type,
'state': 'draft',
'journal_id': _get_journal,
'currency_id': _get_currency,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
'reference_type': 'none',
'check_total': 0.0,