[Erp5-report] r24944 - /erp5/trunk/products/ERP5/Tool/SimulationTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Dec 19 11:32:33 2008
New Revision: 24944

URL: http://svn.erp5.org?rev=24944&view=rev
Log:
Instead of building by hand a query and calling it, it's simpler to use buildSQLQuery while making sure that it won't join with any table.

Modified:
    erp5/trunk/products/ERP5/Tool/SimulationTool.py

Modified: erp5/trunk/products/ERP5/Tool/SimulationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SimulationTool.py?rev=24944&r1=24943&r2=24944&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SimulationTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/SimulationTool.py [utf8] Fri Dec 19 11:32:33 2008
@@ -961,16 +961,14 @@
           where_expression = None
           if len(date_value_list) == 1:
             date = date_value_list[0]
-            if isinstance(date, DateTime):
-              date = date.toZone('UTC').ISO()
-              
             # build a query for date to take range into account
-            date_query_kw = {"inventory.date" : date,
-                             "operator" : column_value_dict.get('date', {}).get('operator', []),
-                             "range"  : column_value_dict.get('date', {}).get('range', []),
-                             }
-            date_query = Query(**date_query_kw)
-            date_query_result = date_query()
+            date_query_result = self.getPortalObject().portal_catalog.buildSQLQuery(**{
+              'inventory.date': {
+                'query': date,
+                'range': column_value_dict.get('date', {}).get('range', [])
+              },
+              'query_table': None,
+            })
             if date_query_result['where_expression'] not in ('',None):
               where_expression = date_query_result['where_expression']
           elif len(date_value_list) > 1: