[Erp5-report] r37885 leonardo - in /erp5/trunk/bt5/erp5_trade: WorkflowTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Aug 18 15:04:49 2010
New Revision: 37885

URL: http://svn.erp5.org?rev=37885&view=rev
Log:
Delegate the Delivery_updateAppliedRule call to Delivery_updateSimulation, which correctly serializes the activation call, instead of duplicating the calculation of the activity tags.

Modified:
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml?rev=37885&r1=37884&r2=37885&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml [utf8] Wed Aug 18 15:04:49 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,23 +51,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>order = state_change[\'object\']\n
-order_path = order.getPath()\n
-path_and_method_id = (order_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = order_path + \'_expand\'\n
-tag = order_path + \'_updateAppliedRule\'\n
-\n
-priority = 3\n
-\n
-activate_kw = { \n
-  \'tag\': expand_tag,\n
-  \'priority\': priority,\n
-}\n
-order.activate(\n
-    after_path_and_method_id=path_and_method_id,\n
-    after_tag=expand_tag,\n
-    tag=tag,\n
-    priority=priority,\n
-    ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
+order.Delivery_updateSimulation()\n
 </string> </value>
         </item>
         <item>
@@ -112,12 +93,6 @@ order.activate(\n
                             <string>_getitem_</string>
                             <string>order</string>
                             <string>_getattr_</string>
-                            <string>order_path</string>
-                            <string>path_and_method_id</string>
-                            <string>expand_tag</string>
-                            <string>tag</string>
-                            <string>priority</string>
-                            <string>activate_kw</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=37885&r1=37884&r2=37885&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Aug 18 15:04:49 2010
@@ -1 +1 @@
-972
\ No newline at end of file
+976
\ No newline at end of file