From cad2a8ee75ea081ffdd77acab1e68ab729997851 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Mon, 15 Jan 2007 12:45:34 +0000 Subject: [PATCH] use getVaultType in OutgoingClassificationSurveyCell_getBaobabDestination git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12097 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...gClassificationSurveyCell_getBaobabDestination.xml | 11 +++++++---- bt5/erp5_banking_cash/bt/revision | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingClassificationSurveyCell_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingClassificationSurveyCell_getBaobabDestination.xml index 44a39b677b..3855800ed3 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingClassificationSurveyCell_getBaobabDestination.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingClassificationSurveyCell_getBaobabDestination.xml @@ -68,10 +68,12 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n - return \'%s/auxiliaire/encaisse_des_billets_ventiles_et_detruits\' %(\'/\'.join(context.getSource().split(\'/\')[:-2]),)\n + <value> <string>document_site = context.getDeliveryValue().getBaobabSourceValue()\n +site_url = context.Baobab_getVaultSite(document_site).getRelativeUrl()\n +if context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n + return \'%s/caveau/serre/encaisse_des_billets_retires_de_la_circulation\' % site_url\n else:\n - return \'%s/auxiliaire/encaisse_des_externes\' %(\'/\'.join(context.getSource().split(\'/\')[:-2]),)\n + return \'%s/caveau/auxiliaire/encaisse_des_externes\' % site_url\n </string> </value> </item> <item> @@ -124,7 +126,8 @@ else:\n <string>kw</string> <string>_getattr_</string> <string>context</string> - <string>_getitem_</string> + <string>document_site</string> + <string>site_url</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index b854a29217..8306ec157b 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -128 \ No newline at end of file +130 \ No newline at end of file -- 2.30.9