take where expression into account as now date comparison will pass through...

take where expression into account as now date comparison will pass through it, keep date parameter for compatibility

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17853 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml

@@ -74,6 +74,12 @@
                                   </dictionary>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>where_expression</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                           </dictionary>
                         </value>
                     </item>
@@ -81,11 +87,12 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>column_value_list_list</string>
-<string>column_id_list</string>
-<string>group_by_expression</string>
-<string>date</string>
-<string>simulation_state</string>
+                            <string>column_value_list_list</string>
+                            <string>column_id_list</string>
+                            <string>group_by_expression</string>
+                            <string>date</string>
+                            <string>simulation_state</string>
+                            <string>where_expression</string>
                           </list>
                         </value>
                     </item>
@@ -106,7 +113,8 @@
 column_id_list:list\r\n
 group_by_expression\r\n
 date\r\n
-simulation_state=delivered</string> </value>
+simulation_state=delivered\r\n
+where_expression</string> </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
@@ -141,6 +149,9 @@ WHERE\n
   <dtml-if date>\n
     AND date <= <dtml-sqlvar date type="string">\n
   </dtml-if>\n
+  <dtml-if where_expression>\n
+    AND <dtml-var where_expression>\n
+  </dtml-if>\n
 GROUP BY\n
   <dtml-var group_by_expression>\n
 
@@ -204,6 +215,9 @@ WHERE\n
   <dtml-if date>\n
     AND date <= <dtml-sqlvar date type="string">\n
   </dtml-if>\n
+  <dtml-if where_expression>\n
+    AND <dtml-var where_expression>\n
+  </dtml-if>\n
 GROUP BY\n
   <dtml-var group_by_expression>\n
 

product/ERP5/bootstrap/erp5_core/bt/revision

-592
+593
\ No newline at end of file