From 24df5a69fe9c1d709da106e31a9a32a4ec0411b2 Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Tue, 5 Feb 2008 15:42:25 +0000 Subject: [PATCH] Calculating correct timezone is difficult. So, get datetime value from document accessor. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19065 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../listbox_operation_date.xml | 2 +- ...ountingTransactionModule_zGetAccountingTransactionList.xml | 4 ++++ bt5/erp5_accounting/bt/revision | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml index 1d9f2d1e35..f949733fef 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml @@ -498,7 +498,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:cell.operation_date.toZone(cell.operation_date.localZone())</string> </value> + <value> <string>python:(cell.section_mark==\'source\' and cell.getStartDate()) or cell.getStopDate()</string> </value> </item> </dictionary> </pickle> 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 11157b1f4b..52860228cd 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 @@ -639,6 +639,7 @@ delivery_mirror_section_title=""</string> </value> <dtml-var sequence-item>\n </dtml-in>\n , delivery.start_date as operation_date\n + , \'source\' as section_mark\n , catalog.source_reference as specific_reference\n <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n @@ -817,6 +818,7 @@ UNION\n <dtml-var sequence-item>\n </dtml-in>\n , delivery.stop_date as operation_date\n + , \'destination\' as section_mark\n , catalog.destination_reference as specific_reference\n <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n @@ -1265,6 +1267,7 @@ UNION\n <dtml-var sequence-item>\n </dtml-in>\n , delivery.start_date as operation_date\n + , \'source\' as section_mark\n , catalog.source_reference as specific_reference\n <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n @@ -1443,6 +1446,7 @@ UNION\n <dtml-var sequence-item>\n </dtml-in>\n , delivery.stop_date as operation_date\n + , \'destination\' as section_mark\n , catalog.destination_reference as specific_reference\n <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n <dtml-let order_column="query[\'order_by_expression\'].split(\' \')[0]">\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 7bfdb2b502..ed1c32452c 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -573 \ No newline at end of file +575 \ No newline at end of file -- 2.30.9