[Erp5-report] r24182 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Oct 14 19:42:05 2008
New Revision: 24182

URL: http://svn.erp5.org?rev=24182&view=rev
Log:
don't use movement relative_urls as keys, to be compatible with temp orders

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateTaxLineList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateTaxLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateTaxLineList.xml?rev=24182&r1=24181&r2=24182&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateTaxLineList.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateTaxLineList.xml Tue Oct 14 19:42:05 2008
@@ -82,9 +82,9 @@
       for base_contribution in movement.getBaseContributionList():\n
         # XXX non optimal loops, may needs optimisation\n
         if base_contribution == base_application:\n
-          applicable_movement_list[movement.getRelativeUrl()] = 1\n
+          applicable_movement_list[id(movement)] = movement\n
   \n
-  for movement in [portal.restrictedTraverse(x) for x in applicable_movement_list.keys()]:\n
+  for movement in applicable_movement_list.values():\n
     movement_price = movement.getTotalPrice(fast=0) or 0\n
     if tax_line.getProperty(\'calculation_script_id\'):\n
       raise NotImplementedError\n
@@ -156,7 +156,7 @@
                             <string>base_contribution_list</string>
                             <string>base_contribution</string>
                             <string>_write_</string>
-                            <string>x</string>
+                            <string>id</string>
                             <string>movement_price</string>
                             <string>NotImplementedError</string>
                             <string>base_amount</string>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=24182&r1=24181&r2=24182&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Oct 14 19:42:05 2008
@@ -1,1 +1,1 @@
-507
+508