From b98b7d08bb115fe7627ee41d5fc9c52e5e8a4151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 20 Mar 2009 10:47:39 +0000 Subject: [PATCH] support the case where there's no date found git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26115 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_trade/OrderModule_getOrderReportSectionList.xml | 8 ++++++-- bt5/erp5_trade/bt/revision | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml index a22a59254c..dd9a629199 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_getOrderReportSectionList.xml @@ -96,13 +96,16 @@ if from_date is None:\n q = NegatedQuery(Query(**kw))\n select_expression = "MIN(delivery.start_date)"\n group_by = "delivery.start_date"\n - from_date = DateTime(context.portal_catalog(\n + from_date = DateTime()\n + result_list = context.portal_catalog(\n select_expression=select_expression,\n group_by_expression=group_by,\n simulation_state=simulation_state,\n portal_type=doc_portal_type,\n query=q,\n - limit=1)[0][2])\n + limit=1)\n + if result_list:\n + from_date = DateTime(result_list[0][2])\n \n \n # get period list between given date\n @@ -219,6 +222,7 @@ return result\n <string>_apply_</string> <string>q</string> <string>select_expression</string> + <string>result_list</string> <string>_getitem_</string> <string>interval_list_dict</string> <string>interval_list</string> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 8ec9b982c4..236c7c706d 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -622 \ No newline at end of file +623 \ No newline at end of file -- 2.30.9