Merge lp:~openerp-dev/openobject-addons/6.0-opw-516452-rgo into lp:openobject-addons/6.0

[Ravi Gohil (OpenERP)]

Hello,

Steps to reproduce the issue:

-> Installed base_report_creator.
-> Created a very simple report with partner name and phone.
-> Executed the report
-> Trying to filter data on tree by name or phone,

This will throw a traceback.

This fixes the issue, fix is back-ported from trunk.

Kindly review this,

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'base_report_creator/base_report_creator.py'
--- base_report_creator/base_report_creator.py	2011-01-17 08:00:48 +0000
+++ base_report_creator/base_report_creator.py	2012-04-27 10:05:21 +0000
@@ -201,18 +201,21 @@
                 else:
                     fields['column_count'] = (False, 'Count')
             newargs = []
-            newargs2 = []
+            query_params = []
             for a in args:
                 if fields[a[0]][0]:
-                    res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1], a[1], a[2]]], active_test = False, context = context)
-                    newargs += res[0]
-                    newargs2 += res[1]
-                else:
-                    newargs += [("count(*) " + a[1] +" " + str(a[2]))]
+                    model = self.pool.get(fields[a[0]][0])
+                    if a[1] in ('like', 'ilike', 'not like', 'not ilike'):
+                        right = '%%%s%%' % (a[2],)
+                    else:
+                        right = a[2]
+                    newargs.append(str(model._table+"."+fields[a[0]][1] + " " +a[1] + " %s "))
+                    query_params.append(right)
             ctx = context or {}
             ctx['getid'] = True
-            sql_query = report.sql_query
-            cr.execute(sql_query) # TODO: FILTER
+            report_pool = self.pool.get('base_report_creator.report')
+            reports = report_pool._sql_query_get(cr, user, [context_id], 'sql_query', None, ctx, where_plus=newargs, limit=limit, offset=offset)
+            cr.execute(reports[context_id], query_params)
             result = cr.fetchall()
             return map(lambda x: x[0], result)