From 28c965d0c0414885928aef20a10e5804f30b8b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 19 Nov 2009 15:41:21 +0000
Subject: [PATCH] use portal_catalog to show only validated accounts (and only
 accounts the current user can view at same time)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30769 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../your_node.xml                                | 16 +++++-----------
 .../your_node.xml                                | 16 +++++-----------
 bt5/erp5_accounting/bt/revision                  |  2 +-
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateRelatedPaymentTransactionListDialog/your_node.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateRelatedPaymentTransactionListDialog/your_node.xml
index ff44e3800f..20476d7413 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateRelatedPaymentTransactionListDialog/your_node.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateRelatedPaymentTransactionListDialog/your_node.xml
@@ -269,11 +269,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -288,18 +285,15 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: [(\'\', \'\')] + [(x.Account_getFormattedTitle(), x.getRelativeUrl()) for x in here.portal_categories.account_type.asset.cash.getAccountTypeRelatedValueList(portal_type=\'Account\')]</string> </value>
+            <value> <string>python: [(\'\', \'\')] + [(x.Account_getFormattedTitle(), x.getRelativeUrl()) for x in context.portal_catalog(account_type_uid=context.portal_categories.account_type.asset.cash.getUid(), portal_type=\'Account\', validation_state=\'validated\')]</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml
index ff44e3800f..20476d7413 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml
@@ -269,11 +269,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -288,18 +285,15 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: [(\'\', \'\')] + [(x.Account_getFormattedTitle(), x.getRelativeUrl()) for x in here.portal_categories.account_type.asset.cash.getAccountTypeRelatedValueList(portal_type=\'Account\')]</string> </value>
+            <value> <string>python: [(\'\', \'\')] + [(x.Account_getFormattedTitle(), x.getRelativeUrl()) for x in context.portal_catalog(account_type_uid=context.portal_categories.account_type.asset.cash.getUid(), portal_type=\'Account\', validation_state=\'validated\')]</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index a89dec1731..09fef806d9 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1034
\ No newline at end of file
+1035
\ No newline at end of file
-- 
2.30.9