Commit d01e8205 authored by Vincent Pelletier's avatar Vincent Pelletier

If at_date is None and date_condition_in_join is true, assume that to_date was provided instead.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19673 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d4239c4e
...@@ -417,7 +417,11 @@ FROM\n ...@@ -417,7 +417,11 @@ FROM\n
item AS next_item\n item AS next_item\n
ON (\n ON (\n
<dtml-if date_condition_in_join>\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 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 AND\n
</dtml-if>\n </dtml-if>\n
next_item.aggregate_uid = item.aggregate_uid\n next_item.aggregate_uid = item.aggregate_uid\n
...@@ -535,7 +539,11 @@ FROM\n ...@@ -535,7 +539,11 @@ FROM\n
item AS next_item\n item AS next_item\n
ON (\n ON (\n
<dtml-if date_condition_in_join>\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 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 AND\n
</dtml-if>\n </dtml-if>\n
next_item.aggregate_uid = item.aggregate_uid\n next_item.aggregate_uid = item.aggregate_uid\n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment