[MERGE] OPW 575071: base_report_creator: read() should respect `ids` and must not...

bzr revid: odo@openerp.com-20120604113108-x9fvenpp61da3any

diff --cc addons/base_report_creator/base_report_creator.py
index 4b7a182,b769bd3..c9b9386
--- 1/addons/base_report_creator/base_report_creator.py
--- 2/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@@ -174,6 -174,14 +174,17 @@@ class report_result(osv.osv)
          report = self.pool.get('base_report_creator.report').browse(cr, user, context.get('report_id'), context=context)
          cr.execute(report.sql_query)
          result = cr.dictfetchall()
 -        #Only return result for requested ids, not all from 'report.sql_query'
 -        result = [r for r in result if r['id'] in set(ids)]
 -        
 -        #Converting None value to False to be handled when using GTK+xmlrpc
++
++        # Filter out results outside of ids - it's a quick hack to respect `ids` without
++        # having to alter the SQL query of the report
++        id_set = set(ids)
++        result = [r for r in result if r['id'] in id_set]
++
++        # Replace `None` values with `False` in result, as it cannot be serialized in XML-RPC
+         for r in result:
 -            for key, value in r.items():
++            for key, value in r.iteritems():
+                 if value is None:
+                     r[key] = False
          return result
  
      def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):