From 24a9ab97636e770dec05d958446adbb9d138ff07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 20 Dec 2005 12:37:25 +0000 Subject: [PATCH] use date from stock table. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4789 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Account_zGetTotalQuantity.xml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetTotalQuantity.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetTotalQuantity.xml index 3fca7aa610..13b1ba9285 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetTotalQuantity.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetTotalQuantity.xml @@ -262,13 +262,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n )\n </dtml-if>\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 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 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 omit_input>\n AND stock.quantity > 0.0\n @@ -308,8 +308,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n <dtml-if query>\n AND category.uid = stock.section_uid\n AND <dtml-var query>\n -</dtml-if>\n - +</dtml-if> ]]></string> </value> </item> @@ -375,13 +374,13 @@ WHERE stock.node_uid = <dtml-var node_uid>\n )\n </dtml-if>\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 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 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 omit_input>\n AND stock.quantity > 0.0\n @@ -421,8 +420,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n <dtml-if query>\n AND category.uid = stock.section_uid\n AND <dtml-var query>\n -</dtml-if>\n - +</dtml-if> ]]></string> </value> </item> -- 2.30.9