[Erp5-report] r17480 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Nov  8 18:20:13 2007
New Revision: 17480

URL: http://svn.erp5.org?rev=17480&view=rev
Log:
There is no special case depending on cash_status when emission_letter != site_letter.

Modified:
    erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
    erp5/trunk/bt5/erp5_banking_cash/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml?rev=17480&r1=17479&r2=17480&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml Thu Nov  8 18:20:13 2007
@@ -98,14 +98,12 @@
     else:\n
       # banknote of any other status from same country -> caisse auxiliaire / billets et monnaies\n
       return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
+  elif emission_letter == "mixed":\n
+    # banknote letter \'mixed\' -> caisse auxiliaire / encaisse externe\n
+    return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
   else: # emission_letter != site_letter\n
-    if cash_status == "to_sort":\n
-      # Foreign unsorted banknotes -> salle_de_tri / encaisse externe\n
-      return \'%s/surface/salle_tri/encaisse_des_externes\' %(site,)\n
-    else:\n
-      # external banknote  -> caisse auxiliaire / encaisse externe\n
-      # banknote letter \'mixed\' -> caisse auxiliaire / encaisse externe\n
-      return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
+    # external banknote  -> caisse auxiliaire / encaisse externe\n
+    return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
 else:\n
   # Coin\n
   if cash_status == "valid":\n

Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=17480&r1=17479&r2=17480&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Thu Nov  8 18:20:13 2007
@@ -1,1 +1,1 @@
-530
+532