← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-708073-psi into lp:openobject-addons

 

Purnendu Singh (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-708073-psi into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #708073 in OpenERP Addons: "[6.0.1] analytic account: view account.analytic.account.tree gives incorrect sum"
  https://bugs.launchpad.net/openobject-addons/+bug/708073

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-708073-psi/+merge/56686

Hello,

Fix: analytic account: view account.analytic.account.tree gives incorrect sum

Thanks
Purnendu Singh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-708073-psi/+merge/56686
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-708073-psi.
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2011-03-24 11:12:12 +0000
+++ analytic/analytic.py	2011-04-07 05:12:29 +0000
@@ -37,9 +37,9 @@
                 res = recursive_computation(son.id, res)
                 for field in field_names:
                     if account.currency_id.id == son.currency_id.id or field=='quantity':
-                        res[account.id][field] += res[son.id][field]
+                        res[account.id][field] = res[son.id][field]
                     else:
-                        res[account.id][field] += currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
+                        res[account.id][field] = currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
             return res
         for account in self.browse(cr, uid, ids, context=context):
             if account.id not in child_ids:


Follow ups