Commit e5a82a11 authored by Jérome Perrin's avatar Jérome Perrin

Add a correct condition to use movement table.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5092 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d9a6052e
......@@ -381,7 +381,7 @@ count=""</string> </value>
<dtml-comment>do something to prevent having entity and section_category set at the same time</dtml-comment>\n
<dtml-let section_category="not entity and section_category or \'\'">\n
\n
<dtml-let use_movement_table="from_date or to_date or at_date or node or resource or stat or amount or amount_range_min or amount_range_max">\n
<dtml-let use_movement_table="from_date or to_date or at_date or node or resource or stat or amount or amount_range_min or amount_range_max or section_category">\n
\n
SELECT\n
<dtml-if stat>\n
......@@ -400,7 +400,7 @@ FROM\n
<dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
\n
<dtml-if use_movement_table>, catalog AS child\n
, movement </dtml-if>\n
, movement </dtml-if>\n
<dtml-if "entity or stat or section_category">, stock </dtml-if>\n
<dtml-if node>, catalog AS source_account </dtml-if>\n
<dtml-if resource>, catalog AS currency </dtml-if>\n
......@@ -513,7 +513,7 @@ WHERE\n
<dtml-comment>do something to prevent having entity and section_category set at the same time</dtml-comment>\n
<dtml-let section_category="not entity and section_category or \'\'">\n
\n
<dtml-let use_movement_table="from_date or to_date or at_date or node or resource or stat or amount or amount_range_min or amount_range_max">\n
<dtml-let use_movement_table="from_date or to_date or at_date or node or resource or stat or amount or amount_range_min or amount_range_max or section_category">\n
\n
SELECT\n
<dtml-if stat>\n
......@@ -532,7 +532,7 @@ FROM\n
<dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
\n
<dtml-if use_movement_table>, catalog AS child\n
, movement </dtml-if>\n
, movement </dtml-if>\n
<dtml-if "entity or stat or section_category">, stock </dtml-if>\n
<dtml-if node>, catalog AS source_account </dtml-if>\n
<dtml-if resource>, catalog AS currency </dtml-if>\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