[Erp5-report] r7622 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jun  6 17:23:29 2006
New Revision: 7622

URL: http://svn.erp5.org?rev=7622&view=rev
Log:
2006-06-06 aurel
* fix delete of objects and bug when using currency with not all variation in fast input save script

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml
    erp5/trunk/bt5/erp5_banking_core/bt/change_log

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml?rev=7622&r1=7621&r2=7622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml Tue Jun  6 17:23:29 2006
@@ -95,7 +95,7 @@
 per_resource_dict = {}\n
 \n
 # remove previous line\n
-old_line = [x.getObject() for x in context.searchFolder(portal_type=[\'Cash Delivery Line\',])]\n
+old_line = [x.getObject() for x in context.searchFolder(portal_type=[line_portal_type,])]\n
 if len(old_line)>0:\n
   for object_list in old_line:\n
     context.deleteContent(object_list.getId())\n
@@ -110,15 +110,33 @@
       # get variation for the cell\n
       if column_base_category == \'cash_status\':\n
         movement[\'cash_status\'] =  "cash_status/%s" %cash_status_list[counter-1]\n
-        movement[\'emission_letter\'] = "emission_letter/%s" %line[\'emission_letter\']\n
-        movement[\'variation\'] = "variation/%s" %line[\'variation\']\n
+        if line.has_key(\'emission_letter\'):\n
+          movement[\'emission_letter\'] = "emission_letter/%s" %line[\'emission_letter\']\n
+        else:\n
+          movement[\'emission_letter\'] = "emission_letter/not_defined" %line[\'emission_letter\']\n
+        if line.has_key(\'variation\'):\n
+          movement[\'variation\'] = "variation/%s" %line[\'variation\']\n
+        else:\n
+          movement[\'variation\'] = "variation/not_defined"\n
       elif column_base_category == \'emission_letter\':\n
-        movement[\'cash_status\'] =  "cash_status/%s" %line[\'cash_status\']\n
+        if line.has_key(\'cash_status\'):\n
+          movement[\'cash_status\'] =  "cash_status/%s" %line[\'cash_status\']\n
+        else:\n
+          movement[\'cash_status\'] =  "cash_status/not_defined"\n
         movement[\'emission_letter\'] = "emission_letter/%s" %emission_letter_list[counter-1]\n
-        movement[\'variation\'] = "variation/%s" %line[\'variation\']\n
+        if line.has_key(\'variation\'):\n
+          movement[\'variation\'] = "variation/%s" %line[\'variation\']\n
+        else:\n
+          movement[\'variation\'] = "variation/not_defined"\n
       else:\n
-        movement[\'cash_status\'] =  "cash_status/%s" %line[\'cash_status\']\n
-        movement[\'emission_letter\'] = "emission_letter/%s" %line[\'emission_letter\']\n
+        if line.has_key(\'cash_status\'):\n
+          movement[\'cash_status\'] =  "cash_status/%s" %line[\'cash_status\']\n
+        else:\n
+          movement[\'cash_status\'] =  "cash_status/not_defined"\n
+        if line.has_key(\'emission_letter\'):\n
+          movement[\'emission_letter\'] = "emission_letter/%s" %line[\'emission_letter\']\n
+        else:\n
+          movement[\'emission_letter\'] = "emission_letter/not_defined"\n
         movement[\'variation\'] = "variation/%s" %variation_list[counter-1]\n
       # generate a key based on variation\n
       # this will allow us to check if there is multiple line for the same resource + variation\n

Modified: erp5/trunk/bt5/erp5_banking_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/change_log?rev=7622&r1=7621&r2=7622&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/change_log Tue Jun  6 17:23:29 2006
@@ -1,3 +1,6 @@
+2006-06-06 aurel
+* fix delete of objects and bug when using currency with not all variation in fast input save script
+
 2006-06-05 aurel
 * complete rewrite of the script that save the fast input for delivery