[FIX] account: treasury analysis compliancy for multi company environments
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Sat, 18 Jun 2011 01:15:47 +0000 (03:15 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Sat, 18 Jun 2011 01:15:47 +0000 (03:15 +0200)
bzr revid: qdp-launchpad@openerp.com-20110618011547-bcxm1m1gu56xyok7

addons/account/report/account_treasury_report.py

index 9b364a5..4d3ec44 100644 (file)
@@ -31,12 +31,13 @@ class account_treasury_report(osv.osv):
     def _compute_balances(self, cr, uid, ids, field_names, arg=None, context=None,
                   query='', query_params=()):
         all_treasury_lines = self.search(cr, uid, [], context=context)
-        current_sum = 0
+        all_companies = self.pool.get('res.company').search(cr, uid, [], context=context)
+        current_sum = dict((company, 0.0) for company in all_companies)
         res = dict((id, dict((fn, 0.0) for fn in field_names)) for id in all_treasury_lines)
         for record in self.browse(cr, uid, all_treasury_lines, context=context):
-            res[record.id]['starting_balance'] = current_sum 
-            current_sum += record.balance
-            res[record.id]['ending_balance'] = current_sum
+            res[record.id]['starting_balance'] = current_sum[record.company_id.id] 
+            current_sum[record.company_id.id] += record.balance
+            res[record.id]['ending_balance'] = current_sum[record.company_id.id]
         return res    
 
     _columns = {