Commit 24a9ab97 authored by Jérome Perrin's avatar Jérome Perrin

use date from stock table.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4789 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 357fae0e
...@@ -262,13 +262,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n ...@@ -262,13 +262,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
)\n )\n
</dtml-if>\n </dtml-if>\n
<dtml-if from_date>\n <dtml-if from_date>\n
AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n AND stock.date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if at_date>\n <dtml-if at_date>\n
AND movement.stop_date <= <dtml-sqlvar at_date type="datetime">\n AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if to_date>\n <dtml-if to_date>\n
AND movement.stop_date < <dtml-sqlvar to_date type="datetime">\n AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if omit_input>\n <dtml-if omit_input>\n
AND stock.quantity > 0.0\n AND stock.quantity > 0.0\n
...@@ -308,8 +308,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n ...@@ -308,8 +308,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
<dtml-if query>\n <dtml-if query>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
AND <dtml-var query>\n AND <dtml-var query>\n
</dtml-if>\n </dtml-if>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -375,13 +374,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n ...@@ -375,13 +374,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
)\n )\n
</dtml-if>\n </dtml-if>\n
<dtml-if from_date>\n <dtml-if from_date>\n
AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n AND stock.date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if at_date>\n <dtml-if at_date>\n
AND movement.stop_date <= <dtml-sqlvar at_date type="datetime">\n AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if to_date>\n <dtml-if to_date>\n
AND movement.stop_date < <dtml-sqlvar to_date type="datetime">\n AND stock.date < <dtml-sqlvar to_date type="datetime">\n
</dtml-if>\n </dtml-if>\n
<dtml-if omit_input>\n <dtml-if omit_input>\n
AND stock.quantity > 0.0\n AND stock.quantity > 0.0\n
...@@ -421,8 +420,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n ...@@ -421,8 +420,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
<dtml-if query>\n <dtml-if query>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
AND <dtml-var query>\n AND <dtml-var query>\n
</dtml-if>\n </dtml-if>
]]></string> </value> ]]></string> </value>
</item> </item>
......
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