From 3382df0cf66aee13cbec10e124ec763563efc3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 10 Dec 2008 14:38:59 +0000 Subject: [PATCH] set selection params explicitly, otherwise previous value will be used when nothing is selected git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24852 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...untModule_getAccountStatementReportSectionList.xml | 11 +++++++---- ...ccountModule_getGeneralLedgerReportSectionList.xml | 6 ++---- bt5/erp5_accounting/bt/revision | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml index c95e1c54df..7e9bbdfd2a 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml @@ -97,18 +97,21 @@ params = dict(at_date=at_date,\n section_uid=section_uid,\n node_uid=traverse(node).getUid(),\n simulation_state=simulation_state,\n - detailed_from_date_summary=detailed_from_date_summary)\n + detailed_from_date_summary=detailed_from_date_summary,\n + hide_grouping=omit_grouping_reference,\n + from_date=None,\n + payment_uid=None,\n + mirror_section_uid=None,)\n \n if from_date:\n params[\'from_date\'] = from_date\n if payment:\n params[\'payment_uid\'] = traverse(payment).getUid()\n if mirror_section:\n - params[\'mirror_section_uid\'] = traverse(mirror_section).getUid()\n + params[\'mirror_section_uid\'] = traverse(mirror_section).getUid() \n if parent_portal_type:\n params[\'parent_portal_type\'] = parent_portal_type\n -if omit_grouping_reference:\n - params[\'hide_grouping\'] = 1\n +\n \n selection_columns = [\n (\'Movement_getSpecificReference\', \'Transaction Reference\'),\n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml index 893a863680..2d60beea12 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml @@ -90,10 +90,8 @@ params = dict(at_date=at_date,\n simulation_state=simulation_state,\n period_start_date=period_start_date,\n movement_portal_type=portal.getPortalAccountingMovementTypeList(),\n - no_mirror_section_uid_cache=1)\n -\n -if request.get(\'omit_grouping_reference\', False):\n - params[\'hide_grouping\'] = True\n + no_mirror_section_uid_cache=1,\n + hide_grouping=request.get(\'omit_grouping_reference\', False))\n \n if from_date:\n params[\'from_date\'] = from_date\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 189296e610..779a8736e2 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -825 \ No newline at end of file +826 \ No newline at end of file -- 2.30.9