diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml index d529f9ca71d0b36cb5733963fbfbe08b1f280f46..ff037d9af2773281f6276fb7c17649fb815910db 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml @@ -534,19 +534,14 @@ destination_section_where_expression</string> </value> <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n </dtml-if>\n \n - <dtml-comment>\n - -- FIXME: we want stop date when we are destination_section and start_date when\n - -- we are source_section (one solution is to read in stock.date, but we try\n - -- to avoid the use of stock table here)\n - </dtml-comment>\n <dtml-if from_date>\n - AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -757,13 +752,13 @@ destination_section_where_expression</string> </value> </dtml-if>\n \n <dtml-if from_date>\n - AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -942,13 +937,13 @@ UNION\n </dtml-if>\n \n <dtml-if from_date>\n - AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.stop_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -1186,19 +1181,14 @@ UNION\n <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n </dtml-if>\n \n - <dtml-comment>\n - -- FIXME: we want stop date when we are destination_section and start_date when\n - -- we are source_section (one solution is to read in stock.date, but we try\n - -- to avoid the use of stock table here)\n - </dtml-comment>\n <dtml-if from_date>\n - AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -1409,13 +1399,13 @@ UNION\n </dtml-if>\n \n <dtml-if from_date>\n - AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -1594,13 +1584,13 @@ UNION\n </dtml-if>\n \n <dtml-if from_date>\n - AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n + AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n </dtml-if>\n <dtml-if to_date>\n - AND movement.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n </dtml-if>\n <dtml-if at_date>\n - AND movement.stop_date < <dtml-sqlvar at_date type="datetime">\n + AND delivery.stop_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 4fe21da97ac9b75a48158e24616e08c36057a7fb..7edd58a8bfe04ca7c3249c6c6d2af5c75392a39e 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -839 \ No newline at end of file +840 \ No newline at end of file