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 303f1dad1dcfa1db1541d6b7188b05cc395c58ae..0725b1221ea6f3ff2cd1a09047c4b60c33c01795 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 @@ -98,14 +98,12 @@ if resource_portal_type == \'Banknote\':\n 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 diff --git a/bt5/erp5_banking_cash/bt/revision b/bt5/erp5_banking_cash/bt/revision index f520b6ed4c0830e653ac02c1f8eec8c51d171997..2b9f7e8533754506e32150af5378b8c45d401641 100644 --- a/bt5/erp5_banking_cash/bt/revision +++ b/bt5/erp5_banking_cash/bt/revision @@ -1 +1 @@ -530 \ No newline at end of file +532 \ No newline at end of file