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

[nobody at svn.erp5.org]

Author: seb
Date: Wed Feb 27 12:25:19 2008
New Revision: 19543

URL: http://svn.erp5.org?rev=19543&view=rev
Log:
Allow users to select a foreign currency on cash balance regulation

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

Modified: erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml?rev=19543&r1=19542&r2=19543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.xml Wed Feb 27 12:25:19 2008
@@ -73,7 +73,8 @@
 vault = transaction.getSource()\n
 \n
 \n
-if not(vault.endswith(\'encaisse_des_billets_et_monnaies\') or vault.endswith(\'encaisse_des_externes\')):\n
+if not (vault.endswith(\'encaisse_des_billets_et_monnaies\') or vault.endswith(\'encaisse_des_externes\')or \\\n
+  \'encaisse_des_devises\' in vault) :\n
    msg = Message(domain="ui", message="Invalid source.")\n
    raise ValidationFailed, (msg,)\n
 \n
@@ -84,6 +85,14 @@
     if line.getEmissionLetter() == site_emission_letter:\n
       msg = Message(domain="ui", message="You must not select the local emission letter.")\n
       raise ValidationFailed, (msg,)\n
+\n
+# check resource between line and document\n
+doc_resource = transaction.getResource()\n
+for line in transaction.contentValues(portal_type=[\'Outgoing Cash Balance Regulation Line\',\n
+                                                   \'Incoming Cash Balance Regulation Line\']):\n
+  if line.getResourceValue().getPriceCurrency() != doc_resource:\n
+    msg = Message(domain="ui", message="Resource defined on document is different from input cash.")\n
+    raise ValidationFailed, (msg,)\n
 \n
 # check again that we are in the good accounting date\n
 transaction.Baobab_checkCounterDateOpen(site=vault, date=transaction.getStartDate())\n
@@ -181,6 +190,7 @@
                             <string>site_emission_letter</string>
                             <string>_getiter_</string>
                             <string>line</string>
+                            <string>doc_resource</string>
                             <string>resource_one</string>
                             <string>resource_two</string>
                             <string>amount</string>

Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=19543&r1=19542&r2=19543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Wed Feb 27 12:25:19 2008
@@ -1,1 +1,1 @@
-602
+603