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 1517b30549754b13780b13b93b12411b8913abaf..7bc297d25c2b1f75f773a07f384543a426ee8c02 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 @@ -17,12 +17,6 @@ </list> </value> </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_arg</string> </key> <value> @@ -360,12 +354,6 @@ </object> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>allow_simple_one_argument_traversal</string> </key> <value> @@ -767,16 +755,11 @@ destination_section_where_expression</string> </value> AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\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 </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n + AND movement.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 @@ -956,19 +939,14 @@ UNION\n AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\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 movement.stop_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 movement.stop_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 movement.stop_date < <dtml-sqlvar at_date type="datetime">\n </dtml-if>\n \n <dtml-if node>\n @@ -1426,16 +1404,11 @@ UNION\n AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\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 </dtml-if>\n <dtml-if to_date>\n - AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n + AND movement.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 @@ -1615,19 +1588,14 @@ UNION\n AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\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 movement.stop_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 movement.stop_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 movement.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 64c6e93534a3034a0aad5ef17cf35af8a7ae8c46..eb90589d8d59ab4e3bd0e568e76a2d6779227996 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -779 \ No newline at end of file +780 \ No newline at end of file