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

[Ujjvala Collins]

[FIX] account:
-----------------------
* Fixed analytic account tree view showing wrong sum for debit, credit, balance and quantity fields. (lp:708073)

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

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

A different fix was merged in trunk at revision 5049 revid:<email address hidden>, hence marking as rejected.
Thanks

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2011-07-01 23:41:24 +0000
+++ analytic/analytic.py	2011-09-15 10:52:26 +0000
@@ -30,11 +30,14 @@
     _description = 'Analytic Account'
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
-        def recursive_computation(account_id, res):
+        def recursive_computation(account_id, res, repeated_account_ids=[]):
             currency_obj = self.pool.get('res.currency')
             account = self.browse(cr, uid, account_id)
             for son in account.child_ids:
+                if son.id in repeated_account_ids:
+                    continue
                 res = recursive_computation(son.id, res)
+                repeated_account_ids.append(son.id)
                 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]