[Erp5-report] r26221 - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_workflow/d...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 31 19:51:18 2009
New Revision: 26221

URL: http://svn.erp5.org?rev=26221&view=rev
Log:
After split and defer, call the builders in sequential order, in the order returned by getBuilderList. This is a quick workaround for the fact that invoice_builder must operate before invoice_tax_builder, and should not have any consequences for delivery where builder order is not important.

Modified:
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml?rev=26221&r1=26220&r2=26221&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml [utf8] Tue Mar 31 19:51:18 2009
@@ -80,9 +80,18 @@
   explanation_uid_list.append(object.getUid())\n
   object = object.getCausalityValue()\n
     \n
-delivery_builder_list = delivery.getBuilderList()\n
-for delivery_builder in delivery_builder_list:\n
-  delivery_builder.activate(activity=\'SQLQueue\',after_tag=tag).build(explanation_uid=explanation_uid_list)\n
+previous_tag = None\n
+for delivery_builder in delivery.getBuilderList():\n
+  this_builder_tag = \'%s_split_%s\' % (delivery.getPath(),\n
+                                      delivery_builder.getId())\n
+  after_tag = [tag]\n
+  if previous_tag:\n
+    after_tag.append(previous_tag)\n
+  delivery_builder.activate(activity=\'SQLQueue\',\n
+                            tag=this_builder_tag,\n
+                            after_tag=after_tag).build(\n
+                                  explanation_uid=explanation_uid_list)\n
+  previous_tag = this_builder_tag\n
 </string> </value>
         </item>
         <item>
@@ -133,8 +142,10 @@
                             <string>None</string>
                             <string>explanation_uid_list</string>
                             <string>object</string>
-                            <string>delivery_builder_list</string>
+                            <string>previous_tag</string>
                             <string>delivery_builder</string>
+                            <string>this_builder_tag</string>
+                            <string>after_tag</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=26221&r1=26220&r2=26221&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Mar 31 19:51:18 2009
@@ -1,1 +1,1 @@
-565
+575