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 f46109cf2dca9bb2747712054bcf8fadfe450a09..c0285ea8aa9ba9b2f1e59addbf494feeff331f4b 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 @@ -110,13 +110,23 @@ if funding_category:\n if funding_category == \'None\':\n params[\'funding_uid\'] = Query(funding_uid=None)\n else:\n - params[\'funding_category\'] = funding_category\n + funding_value = portal.restrictedTraverse(funding_category, None)\n + if funding_value is not None and funding_value.getPortalType() != \'Category\':\n + params[\'funding_uid\'] = funding_value.getUid()\n + else:\n + params[\'funding_category\'] = funding_category\n +\n function_category = request.get(\'function\')\n if function_category:\n if function_category == \'None\':\n params[\'function_uid\'] = Query(function_uid=None)\n else:\n - params[\'function_category\'] = function_category\n + function_value = portal.restrictedTraverse(function_category, None)\n + if function_value is not None and function_value.getPortalType() != \'Category\':\n + params[\'function_uid\'] = function_value.getUid()\n + else:\n + params[\'function_category\'] = function_category\n +\n if mirror_section:\n mirror_section_uid = portal.restrictedTraverse(mirror_section).getUid()\n params[\'mirror_section_uid\'] = mirror_section_uid\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 9f43b76d9923e9fdfd27aec0ffe1752c5a50a8d5..6005e30972ed2a9666dcce3bfd4b90b2cad7cd9d 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1501 +1502 \ No newline at end of file