diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml index 14d6c07cec9c82a239c63bbe7424fed8a62573f8..2a4f82c32cc45301a7307a8a832e0b5bcfc7724b 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_asCellRange.xml @@ -82,8 +82,10 @@ dimension_result_list = []\n \n for dimension in dimension_list:\n if dimension is not None:\n - predicate_list = context.searchFolder(string_index=dimension,\n - sort_on=\'int_index\')\n + predicate_list = [x for x in context.contentValues(portal_type=\'Predicate\')\n + if x.getProperty(\'string_index\') == dimension ]\n + predicate_list.sort(lambda a,b: cmp(a.getProperty(\'int_index\', 0),\n + b.getProperty(\'int_index\', 1)))\n if len(predicate_list):\n dimension_result_list.append(predicate_list)\n \n @@ -156,11 +158,11 @@ return dimension_ids_list\n <string>dimension_result_list</string> <string>dimension</string> <string>None</string> + <string>x</string> <string>predicate_list</string> <string>len</string> <string>dimension_ids_list</string> <string>dimension_result</string> - <string>x</string> </tuple> </value> </item> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index f3a5e81bae44f61651a487c649ecc541c10861e7..4e66132b50032ef4b80cd41c36efeb2353360c8c 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -281 \ No newline at end of file +282 \ No newline at end of file