Commit 869fb374 authored by Jérome Perrin's avatar Jérome Perrin

bug fix : account_type has been changed from asset/bank/cash to asset/cash/bank

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5324 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8b39f62c
...@@ -247,7 +247,7 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -247,7 +247,7 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
AND movement.is_accountable = 1\n AND movement.is_accountable = 1\n
AND node.uid = stock.node_uid\n AND node.uid = stock.node_uid\n
AND node.uid = node_category.uid\n AND node.uid = node_category.uid\n
AND node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.asset.bank.getUid()" type="int">\n AND node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.asset.cash.getUid()" type="int">\n
<dtml-if node_uid>\n <dtml-if node_uid>\n
AND (\n AND (\n
<dtml-in node_uid>\n <dtml-in node_uid>\n
...@@ -263,13 +263,13 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -263,13 +263,13 @@ WHERE stock.section_uid = <dtml-var getParentUid>\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\n AND stock.quantity > 0\n
...@@ -286,12 +286,12 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -286,12 +286,12 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
</dtml-if>\n </dtml-if>\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>\n
<dtml-unless stat>\n <dtml-unless stat>\n
GROUP BY catalog.uid\n GROUP BY catalog.uid\n
</dtml-unless>\n </dtml-unless>\n
ORDER BY movement.start_date, movement.uid\n ORDER BY stock.date, movement.uid\n
</dtml-if>\n </dtml-if>\n
...@@ -361,7 +361,7 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -361,7 +361,7 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
AND movement.is_accountable = 1\n AND movement.is_accountable = 1\n
AND node.uid = stock.node_uid\n AND node.uid = stock.node_uid\n
AND node.uid = node_category.uid\n AND node.uid = node_category.uid\n
AND node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.asset.bank.getUid()" type="int">\n AND node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.asset.cash.getUid()" type="int">\n
<dtml-if node_uid>\n <dtml-if node_uid>\n
AND (\n AND (\n
<dtml-in node_uid>\n <dtml-in node_uid>\n
...@@ -377,13 +377,13 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -377,13 +377,13 @@ WHERE stock.section_uid = <dtml-var getParentUid>\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\n AND stock.quantity > 0\n
...@@ -400,12 +400,12 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -400,12 +400,12 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
</dtml-if>\n </dtml-if>\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>\n
<dtml-unless stat>\n <dtml-unless stat>\n
GROUP BY catalog.uid\n GROUP BY catalog.uid\n
</dtml-unless>\n </dtml-unless>\n
ORDER BY movement.start_date, movement.uid\n ORDER BY stock.date, movement.uid\n
</dtml-if>\n </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