fixed unknown variable in some workflow scripts.

fixed again the destination on cash sorting cells

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12953 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml

@@ -77,7 +77,7 @@ site = context.Baobab_getVaultSite(context.getSource()).getRelativeUrl()\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 (context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\') and emission_letter in site_letter:\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
@@ -85,6 +85,8 @@ elif (context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'can
     # 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
+  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

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/scripts/checkConsistency.xml

@@ -77,7 +77,7 @@ in_list = txn.objectValues(portal_type=\'Incoming Cash Sorting Incident Line\')\
 out_list = txn.objectValues(portal_type=\'Outgoing Cash Sorting Incident Line\')\n
 \n
 # check again that we are in the good accounting date\n
-if not transaction.Baobab_checkCounterDateOpen():\n
+if not txn.Baobab_checkCounterDateOpen():\n
   msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
   raise ValidationFailed, (msg,)\n
 \n
@@ -155,7 +155,6 @@ if len(out_list) !=0:\n
                             <string>_getattr_</string>
                             <string>in_list</string>
                             <string>out_list</string>
-                            <string>transaction</string>
                             <string>msg</string>
                             <string>price</string>
                             <string>in_price</string>

bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/scripts/checkDestination.xml

@@ -91,7 +91,7 @@ if \'encaisse_des_billets_retires_de_la_circulation\' in dest.getRelativeUrl():\
   raise ValidationFailed, (msg,)\n
 \n
 # check again that we are in the good accounting date\n
-if not transaction.Baobab_checkCounterDateOpen(site=dest, date=transaction.getStartDate()):\n
+if not object.Baobab_checkCounterDateOpen(site=dest, date=object.getStartDate()):\n
   msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
   raise ValidationFailed, (msg,)\n
 \n
@@ -159,7 +159,6 @@ if \'transit\' not in dest.getRelativeUrl():\n
                             <string>_getitem_</string>
                             <string>msg</string>
                             <string>dest</string>
-                            <string>transaction</string>
                             <string>first_movement</string>
                             <string>line_letter</string>
                           </tuple>

bt5/erp5_banking_cash/bt/revision

-182
\ No newline at end of file
+185
\ No newline at end of file