[Erp5-report] r17498 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Nov  9 17:51:17 2007
New Revision: 17498

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

Modified:
    erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml
    erp5/trunk/bt5/erp5_banking_cash/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml?rev=17498&r1=17497&r2=17498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.xml Fri Nov  9 17:51:17 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
   destination = context.getDestination()\n
   if destination is None:\n
     return None\n
@@ -77,7 +77,7 @@
   for site in site_list:\n
     if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\') and destination in site:\n
       source_trade = site + \'/encaisse_des_billets_et_monnaies/entrante\'\n
-      if context.getSimulationState() == \'delivered\':\n
+      if context.getSourceTrade() != source_trade:\n
         context.setSourceTrade(source_trade)\n
       return source_trade\n
   from Products.ERP5Type.Message import Message\n

Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=17498&r1=17497&r2=17498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Nov  9 17:51:17 2007
@@ -1,1 +1,1 @@
-532
+533