From c17a3c00715eeabb7ffbf0380b8b13d2ea728c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 21 Jun 2007 10:21:56 +0000
Subject: [PATCH] rewrite script to getBaobabDestination on cash sorting cell
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14904 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...ngCashSortingCell_getBaobabDestination.xml | 65 ++++++++++++-------
bt5/erp5_banking_cash/bt/revision | 2 +-
2 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
index 41bed15551..f7950491fb 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
@@ -65,36 +65,58 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>if context.getSource() is None:\n
+ <value> <string encoding="cdata"><![CDATA[
+
+if context.getSource() is None:\n
return None\n
\n
site_letter = context.getSourceValue().getCodification()[0].lower()\n
site = context.Baobab_getVaultSite(context.getSource()).getRelativeUrl()\n
cash_status = context.getCashStatus()\n
-\n
+# possible cash status : cancelled, to_sort, valid\n
emission_letter = context.getEmissionLetter()\n
-if emission_letter!=\'not_defined\' and not (emission_letter in site_letter):\n
- return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
-elif cash_status == "mixed":\n
+\n
+if cash_status == "to_sort" and emission_letter == "not_defined":\n
+ # billet lettre not defined / a trier -> caisse source\n
+ return context.getSource()\n
+elif emission_letter != site_letter:\n
+ # billet externe -> caisse auxiliaire / encaisse externe\n
+ # billet lettre mixed -> caisse auxiliaire / encaisse externe\n
return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
-elif emission_letter==\'not_defined\':\n
- # remaining banknote which are not sorted yet, or cancelled one\n
- if not \'ventilation\' in context.getSource():\n
- return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
- else:\n
- if context.getCashStatus() in ("to_sort",):\n
- return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
- else:\n
- # take classification into account here\n
- source_list = context.getSource().split(\'/\')\n
- return \'%s/caveau/auxiliaire/%s\' %(site,\'/\'.join(source_list[-2:]))\n
-elif (context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\') and emission_letter in site_letter:\n
+elif cash_status in ("cancelled", "to_sort"):\n
+ # billet annul\xe9 ou a trier du pays -> caisse auxiliaire / billets et monnaies\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
-elif emission_letter in site_letter:\n
+elif cash_status == "valid":\n
+ # billet valide du pays -> caisse de reserve / billets et monnaies\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
-else:\n
- return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
-</string> </value>
+ \n
+\n
+ \n
+# if emission_letter!=\'not_defined\' and not (emission_letter in site_letter):\n
+# return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
+# elif cash_status == "mixed":\n
+# return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
+# elif emission_letter==\'not_defined\':\n
+# # remaining banknote which are not sorted yet, or cancelled one\n
+# if not \'ventilation\' in context.getSource():\n
+# return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
+# else:\n
+# if context.getCashStatus() in ("to_sort",):\n
+# return context.getSource()\n
+# #return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
+# else:\n
+# # take classification into account here\n
+# source_list = context.getSource().split(\'/\')\n
+# return \'%s/caveau/auxiliaire/%s\' %(site,\'/\'.join(source_list[-2:]))\n
+# elif (context.getCashStatus() in (\'to_sort\', \'cancelled\')) and emission_letter in site_letter:\n
+# return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
+# elif emission_letter in site_letter:\n
+# return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
+# else:\n
+# return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -152,7 +174,6 @@ else:\n
<string>site</string>
<string>cash_status</string>
<string>emission_letter</string>
- <string>source_list</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision
index b0e9f8d0ff..4f36264f98 100644
--- a/bt5/erp5_banking_cash/bt/revision
+++ b/bt5/erp5_banking_cash/bt/revision
@@ -1 +1 @@
-358
\ No newline at end of file
+360
\ No newline at end of file
--
2.30.9