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

[REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error 

Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-20110131082002-xzx4v2adzdvv8nmg

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

bzr revid: odo@openerp.com-20110203222026-ln6hmyivaj9bo11g
This commit is contained in:
Olivier Dony 2011-02-03 23:20:26 +01:00
parent df6f269daa
commit 4900c41842
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/account/account.py
View File

@ -301,11 +301,10 @@ class account_account(osv.osv):
for fn in field_names:
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
for child in current.child_id:
if sums.get(child.id, False):
if child.company_id.currency_id.id == current.company_id.currency_id.id:
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
if child.company_id.currency_id.id == current.company_id.currency_id.id:
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
res = {}
null_result = dict((fn, 0.0) for fn in field_names)
for id in ids: