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

[FIX] res.currency, account: moved account-related res.currency code from base (second part) 

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

bzr revid: odo@openerp.com-20101222174159-t4i0am9adanns3ya
This commit is contained in:
Olivier Dony 2010-12-22 18:41:59 +01:00
parent fd5d06ec56
commit 9e5a6481a3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/account/account_bank_statement.py
View File

@ -225,9 +225,11 @@ class account_bank_statement(osv.osv):
account_id = st.journal_id.default_debit_account_id.id
acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
context.update({
'res.currency.compute.account': acc_cur,
})
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, st_line.amount, context=context,
account=acc_cur)
company_currency_id, st_line.amount, context=context)
val = {
'name': st_line.name,
@ -245,20 +247,15 @@ class account_bank_statement(osv.osv):
'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, st_line.amount, context=context,
account=acc_cur)
if st.currency.id <> company_currency_id:
amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
st.currency.id, amount, context=context,
account=acc_cur)
st.currency.id, amount, context=context)
val['amount_currency'] = -amount_cur
if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
val['currency_id'] = st_line.account_id.currency_id.id
amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
st_line.account_id.currency_id.id, amount, context=context,
account=acc_cur)
st_line.account_id.currency_id.id, amount, context=context)
val['amount_currency'] = -amount_cur
move_line_id = account_move_line_obj.create(cr, uid, val, context=context)