simplify build process and wait for expand activities of related documents.

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml

@@ -51,25 +51,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>delivery = state_change[\'object\']\n
-delivery_path = delivery.getPath()\n
-path_and_method_id = (delivery_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = delivery_path + \'_expand\'\n
-tag = delivery_path + \'_updateAppliedRule\'\n
-\n
-priority = 3\n
-\n
-activate_kw = { \n
-  \'tag\': expand_tag,\n
-  \'priority\': priority,\n
-}\n
-delivery.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
-\n
-delivery.activate(after_tag=(tag, expand_tag)).Delivery_buildOnComposedDocument()\n
+delivery.Delivery_expandAndBuild()\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/bt/revision

-1465
+1466
\ No newline at end of file

bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_expandAndBuild.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>delivery = context\n
+delivery_path = delivery.getPath()\n
+path_and_method_id = (delivery_path, (\'immediateReindexObject\', \'recursiveImmediateReindexObject\'))\n
+expand_tag = delivery_path + \'_expand\'\n
+tag = delivery_path + \'_updateAppliedRule\'\n
+after_tag = [expand_tag]\n
+\n
+# wait for expand activities of related documents.\n
+# XXX ideally, it should be calculated by explanation tree, instead of causalities.\n
+for causality in delivery.getCausalityValueList():\n
+  after_tag.append(\'%s_expand\' % causality.getPath())\n
+\n
+priority = 3\n
+activate_kw = { \n
+  \'tag\': expand_tag,\n
+  \'priority\':priority,\n
+}\n
+delivery.activate(\n
+    after_path_and_method_id=path_and_method_id,\n
+    after_tag=after_tag,\n
+    tag=tag,\n
+    priority=priority,\n
+    ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
+delivery.activate(after_tag=(tag, expand_tag)).Delivery_buildOnComposedDocument()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Delivery_expandAndBuild</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_simulation/bt/revision

-157
+158
\ No newline at end of file

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml

@@ -51,25 +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
-\n
-order.activate(after_tag=(tag, expand_tag)).Delivery_buildOnComposedDocument()\n
+order.Delivery_expandAndBuild()\n
 </string> </value>
         </item>
         <item>

bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml

@@ -51,25 +51,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>packing_list = state_change[\'object\']\n
-packing_list_path = packing_list.getPath()\n
-path_and_method_id = (packing_list_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = packing_list_path + \'_expand\'\n
-tag = packing_list_path + \'_updateAppliedRule\'\n
-\n
-priority = 3\n
-\n
-activate_kw = { \n
-  \'tag\': expand_tag,\n
-  \'priority\': priority,\n
-}\n
-packing_list.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
-\n
-packing_list.activate(after_tag=(tag, expand_tag)).Delivery_buildOnComposedDocument()\n
+packing_list.Delivery_expandAndBuild()\n
 </string> </value>
         </item>
         <item>

bt5/erp5_trade/bt/revision

-1132
+1133
\ No newline at end of file