[Erp5-report] r17853 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: aurel
Date: Wed Nov 28 13:19:55 2007
New Revision: 17853

URL: http://svn.erp5.org?rev=17853&view=rev
Log:
take where expression into account as now date comparison will pass through it, keep date parameter for compatibility

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml?rev=17853&r1=17852&r2=17853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml Wed Nov 28 13:19:55 2007
@@ -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 @@
   <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 @@
   <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
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=17853&r1=17852&r2=17853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Nov 28 13:19:55 2007
@@ -1,1 +1,1 @@
-592
+593