diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml index c5cff24134e378ab436f258e45d94a70a164818b..2ba593a4eeb3d2beb231660f8cf60bc93ca82336 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationPaymentItemList.xml @@ -75,13 +75,16 @@ item_list = [[\'\', \'\']]\n \n entity = context.getDestinationSectionValue()\n if entity is not None:\n - bank_account_list = entity.contentValues(filter={\'portal_type\':\n + bank_account_id_list = entity.contentIds(filter={\'portal_type\':\n entity.getPortalPaymentNodeTypeList()})\n - for bank_account in bank_account_list:\n - url = bank_account.getRelativeUrl()\n - #label = bank_account.getIban()\n - label = bank_account.getReference() or bank_account.getTitle()\n - item_list.append([label, url])\n + for bank_account_id in bank_account_id_list:\n + # skip objects we are not allowed to access\n + bank_account = entity.restrictedTraverse(bank_account_id, None)\n + if bank_account is not None and \\\n + bank_account.getValidationState() != \'invalidated\':\n + url = bank_account.getRelativeUrl()\n + label = bank_account.getReference() or bank_account.getTitle()\n + item_list.append([label, url])\n \n item_list.sort(sort)\n return item_list\n @@ -133,8 +136,9 @@ return item_list\n <string>context</string> <string>entity</string> <string>None</string> - <string>bank_account_list</string> + <string>bank_account_id_list</string> <string>_getiter_</string> + <string>bank_account_id</string> <string>bank_account</string> <string>url</string> <string>label</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml index f68710d6f67b5b0bd8d85688fec41c8cb003bb7f..f377d9187b953392ac1cf37b6a5efb1d69852ad2 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourcePaymentItemList.xml @@ -75,12 +75,16 @@ item_list = [[\'\', \'\']]\n \n entity = context.getSourceSectionValue()\n if entity is not None:\n - bank_account_list = entity.contentValues(filter={\'portal_type\':\n - entity.getPortalPaymentNodeTypeList()})\n - for bank_account in bank_account_list:\n - url = bank_account.getRelativeUrl()\n - label = bank_account.getReference() or bank_account.getTitle()\n - item_list.append([label, url])\n + bank_account_id_list = entity.contentIds(filter={\'portal_type\':\n + entity.getPortalPaymentNodeTypeList()})\n + for bank_account_id in bank_account_id_list:\n + # skip objects we are not allowed to access\n + bank_account = entity.restrictedTraverse(bank_account_id, None)\n + if bank_account is not None and \\\n + bank_account.getValidationState() != \'invalidated\':\n + url = bank_account.getRelativeUrl()\n + label = bank_account.getReference() or bank_account.getTitle()\n + item_list.append([label, url])\n \n item_list.sort(sort)\n return item_list\n @@ -132,8 +136,9 @@ return item_list\n <string>context</string> <string>entity</string> <string>None</string> - <string>bank_account_list</string> + <string>bank_account_id_list</string> <string>_getiter_</string> + <string>bank_account_id</string> <string>bank_account</string> <string>url</string> <string>label</string> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 12e255591973bdba2df68092427a8e1f954f18dc..6fc1e6e18c45e38dba6c96fe27ed3514edfbb064 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -177 \ No newline at end of file +178 \ No newline at end of file