From c45e42516e77f779e33713730fcacdeccbe12cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Thu, 30 Nov 2006 15:17:57 +0000 Subject: [PATCH] 2006-11-30 aurel * fix z_catalog_item_list git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11549 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_catalog/erp5_mysql/z_catalog_item_list.xml | 4 ++-- bt5/erp5_banking_core/bt/change_log | 3 +++ bt5/erp5_banking_core/bt/revision | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml index 6b939f788e..ece076cf03 100644 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_item_list.xml @@ -178,7 +178,7 @@ WHERE\n \n <dtml-let movement_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isMovement[loop_item] and getAggregateUidList[loop_item]">\n + <dtml-if "isMovement[loop_item] and getAggregateUidList[loop_item] and isAccountable[loop_item] ">\n <dtml-call expr="movement_list.append(loop_item)">\n </dtml-if>\n </dtml-in>\n @@ -255,7 +255,7 @@ WHERE\n \n <dtml-let movement_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isMovement[loop_item] and getAggregateUidList[loop_item]">\n + <dtml-if "isMovement[loop_item] and getAggregateUidList[loop_item] and isAccountable[loop_item] ">\n <dtml-call expr="movement_list.append(loop_item)">\n </dtml-if>\n </dtml-in>\n diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log index 48cd1db81f..7e9ca60aec 100644 --- a/bt5/erp5_banking_core/bt/change_log +++ b/bt5/erp5_banking_core/bt/change_log @@ -1,3 +1,6 @@ +2006-11-30 aurel +* fix z_catalog_item_list + 2006-10-17 aurel * move bank account wf from base to banking_core diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index b44fe09a7a..3d9aebb2cc 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -65 \ No newline at end of file +68 \ No newline at end of file -- 2.30.9