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

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jan 22 13:24:45 2008
New Revision: 18820

URL: http://svn.erp5.org?rev=18820&view=rev
Log:
fix condition + getTotalPrice must not be fast

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

Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_getBaobabDestination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_getBaobabDestination.xml?rev=18820&r1=18819&r2=18820&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_getBaobabDestination.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_getBaobabDestination.xml Tue Jan 22 13:24:45 2008
@@ -67,7 +67,7 @@
             <key> <string>_body</string> </key>
             <value> <string>source = context.getSource()\n
 destination = context.getDestinationSection()\n
-if source is None and destination is None:\n
+if source is None or destination is None:\n
   return None\n
 if source.split("/")[-1] == destination.split("/")[-1]:\n
   destination = "site/agence/principale/%s/caveau/serre/encaisse_des_billets_neufs_non_emis" % destination.split("/")[-1]\n

Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_viewCashContainerInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_viewCashContainerInputDialog.xml?rev=18820&r1=18819&r2=18820&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_viewCashContainerInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmmited_viewCashContainerInputDialog.xml Tue Jan 22 13:24:45 2008
@@ -98,7 +98,7 @@
       container_dict[\'cash_number_range_stop\'] = cash_container.getCashNumberRangeStop()\n
       container_dict[\'resource_translated_title\'] = container_line.getResourceTranslatedTitle()\n
       container_dict[\'quantity\'] = container_line.getQuantity()\n
-      container_dict[\'total_price\'] = container_line.getTotalPrice()\n
+      container_dict[\'total_price\'] = container_line.getTotalPrice(fast=0)\n
       container_dict[\'selection\'] = 0\n
       container_dict[\'uid\'] = \'new_%s\' %(cash_container.getUid(),)   #cash_container.getReference().replace(\'/\', \'_\'),)\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=18820&r1=18819&r2=18820&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Tue Jan 22 13:24:45 2008
@@ -1,1 +1,1 @@
-562
+564