openerp-dev-web team mailing list archive

["Valencia Rodrigues \(OpenERP\)" <vro@xxxxxxxxxxx>]

Valencia Rodrigues (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-781701-vro into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #728417 in OpenERP Addons: "Exception raised when setting an Account InActive"
  https://bugs.launchpad.net/openobject-addons/+bug/728417
  Bug #781701 in OpenERP Addons: "Error on unchecking Account active"
  https://bugs.launchpad.net/openobject-addons/+bug/781701

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-781701-vro/+merge/61201

Corrects error on unchecking account active in _compute method
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-781701-vro/+merge/61201
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-781701-vro.

=== modified file 'account/account.py'
--- account/account.py	2011-05-06 15:37:57 +0000
+++ account/account.py	2011-05-17 06:04:49 +0000
@@ -249,6 +249,7 @@
         children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
         #compute for each account the balance/debit/credit from the move lines
         accounts = {}
+        sums = {}
         if children_and_consolidated:
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
@@ -284,7 +285,6 @@
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
             brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
-            sums = {}
             currency_obj = self.pool.get('res.currency')
             while brs:
                 current = brs[0]
@@ -305,11 +305,11 @@
                             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:
-                res[id] = sums.get(id, null_result)
-            return res
+        res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
+        for id in ids:
+            res[id] = sums.get(id, null_result)
+        return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}