[Erp5-report] r17499 - in /erp5/trunk/bt5/erp5_banking_check: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Nov  9 17:59:28 2007
New Revision: 17499

URL: http://svn.erp5.org?rev=17499&view=rev
Log:
change condition to record source trade

Modified:
    erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml
    erp5/trunk/bt5/erp5_banking_check/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml?rev=17499&r1=17498&r2=17499&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml Fri Nov  9 17:59:28 2007
@@ -66,7 +66,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>source_trade = context.getSourceTrade()\n
-if source_trade is None:\n
+if source_trade is None or context.getSimulationState() != \'delivered\':\n
   user_id = context.Base_getLastUserIdByTransition(workflow_id=\'check_payment_workflow\', transition_id=\'deliver_action\')\n
   if user_id is not None:\n
     site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
@@ -77,7 +77,7 @@
         source_trade = site + \'/encaisse_des_billets_et_monnaies/sortante\'\n
         # Save it only once we are sure that the document will not change any more\n
         # and that we will not have many users trying to do deliver_action\n
-        if context.getSimulationState() == \'delivered\':\n
+        if context.getSourceTrade() != source_trade:\n
           context.setSourceTrade(source_trade)\n
 return source_trade\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=17499&r1=17498&r2=17499&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Fri Nov  9 17:59:28 2007
@@ -1,1 +1,1 @@
-339
+340