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

[Purnendu Singh (OpenERP)]

Hello,

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

Thanks
Purnendu Singh

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

char of analytic accounts + analytic account menu => just show debit/credit/balance only in child row .. should also be reflect to parents.

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

i reject the merge its not solve the problem. we should fix it in better way.

=== 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: