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

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Mar  4 18:17:37 2008
New Revision: 19673

URL: http://svn.erp5.org?rev=19673&view=rev
Log:
If at_date is None and date_condition_in_join is true, assume that to_date was provided instead.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml?rev=19673&r1=19672&r2=19673&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml Tue Mar  4 18:17:37 2008
@@ -417,7 +417,11 @@
     item AS next_item\n
   ON (\n
     <dtml-if date_condition_in_join>\n
+    <dtml-if expr="at_date is not None">\n
        next_item.date <= <dtml-sqlvar at_date type="string">\n
+    <dtml-else>\n
+       next_item.date < <dtml-sqlvar to_date type="string">\n
+    </dtml-if>\n
     AND\n
     </dtml-if>\n
     next_item.aggregate_uid = item.aggregate_uid\n
@@ -535,7 +539,11 @@
     item AS next_item\n
   ON (\n
     <dtml-if date_condition_in_join>\n
+    <dtml-if expr="at_date is not None">\n
        next_item.date <= <dtml-sqlvar at_date type="string">\n
+    <dtml-else>\n
+       next_item.date < <dtml-sqlvar to_date type="string">\n
+    </dtml-if>\n
     AND\n
     </dtml-if>\n
     next_item.aggregate_uid = item.aggregate_uid\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=19673&r1=19672&r2=19673&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Mar  4 18:17:37 2008
@@ -1,1 +1,1 @@
-722
+723