[Erp5-report] r24577 - in /erp5/trunk/bt5/erp5_banking_cash: WorkflowTemplateItem/portal_wo...

[nobody at svn.erp5.org]

Author: aurel
Date: Thu Nov 13 10:48:30 2008
New Revision: 24577

URL: http://svn.erp5.org?rev=24577&view=rev
Log:
also check the vault in condition

Modified:
    erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
    erp5/trunk/bt5/erp5_banking_cash/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml?rev=24577&r1=24576&r2=24577&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml [utf8] Thu Nov 13 10:48:30 2008
@@ -101,7 +101,8 @@
          site_country == source_country:\n
     msg = Message(domain="ui", message="You must select an agency from a foreign country.")    \n
     raise ValidationFailed, (msg,)\n
-  elif site_country != source_country:    \n
+  elif \'encaisse_des_billets_retires_de_la_circulation\' in vault and \\\n
+         site_country != source_country:    \n
     msg = Message(domain="ui", message="You must select an agency from the same country.")    \n
     raise ValidationFailed, (msg,)\n
  \n

Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=24577&r1=24576&r2=24577&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision [utf8] Thu Nov 13 10:48:30 2008
@@ -1,1 +1,1 @@
-650
+651