[FIX] account: allows duplication of account
lp bug: https://launchpad.net/bugs/708603 fixed bzr revid: mtr@mtr-20110131063645-pjwyyj3uv1jp40i1
This commit is contained in:
parent
f010d48772
commit
6127d931f3
|
@ -300,13 +300,12 @@ class account_account(osv.osv):
|
|||
brs.pop(0)
|
||||
for fn in field_names:
|
||||
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
|
||||
if current.child_id:
|
||||
for child in current.child_id:
|
||||
if child.company_id.currency_id.id == current.company_id.currency_id.id:
|
||||
if sums.get(child.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)
|
||||
for child in current.child_id:
|
||||
if child.company_id.currency_id.id == current.company_id.currency_id.id:
|
||||
if sums.get(child.id, False):
|
||||
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:
|
||||
|
|
Loading…
Reference in New Issue