From 46d30269cadeaae17416a8a72d860b74b15531b2 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 24 May 2010 14:25:54 +0000
Subject: [PATCH] build() activity should wait for '(path)_updateAppliedRule'
 tag, otherwise it will be invoked too early.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35573 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../scripts/buildTradeModelLineList.xml                | 10 +++++++---
 bt5/erp5_accounting/bt/revision                        |  2 +-
 .../scripts/Order_buildPackingList.xml                 |  4 ++--
 bt5/erp5_mrp/bt/revision                               |  2 +-
 bt5/erp5_open_trade/bt/revision                        |  2 +-
 .../task_workflow/scripts/Task_buildTaskReport.xml     |  2 +-
 bt5/erp5_project/bt/revision                           |  2 +-
 .../order_workflow/scripts/Order_buildPackingList.xml  |  2 +-
 bt5/erp5_trade/bt/revision                             |  2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
index 697da6a3fb..4ade3cdd72 100644
--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
@@ -71,11 +71,13 @@ builder = getattr(portal_deliveries,\n
                   builder_by_portal_type[delivery_portal_type],\n
                   None)\n
 \n
-expand_tag = \'%s_expand\' % delivery.getPath()\n
+path = delivery.getPath()\n
+tag = \'%s_updateAppliedRule\' % path\n
+expand_tag = \'%s_expand\' % path\n
 build_tag = \'invoice_transaction_build_trade_model_%s\' % delivery.getRelativeUrl()\n
 build_accounting_tag = \'invoice_transaction_build_accounting_%s\' % delivery.getRelativeUrl()\n
 \n
-delivery.activate(after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=dict(tag=expand_tag))\n
+delivery.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=dict(tag=expand_tag))\n
 \n
 if builder is not None:\n
   explanation_uid_list = [delivery.getUid(), ]\n
@@ -92,7 +94,7 @@ if builder is not None:\n
 \n
   builder.activate(\n
       activity=\'SQLQueue\',\n
-      after_tag=expand_tag,\n
+      after_tag=(tag, expand_tag),\n
       tag=build_tag,\n
       activate_kw=dict(tag=build_tag)).build(activate_kw=dict(tag=build_tag),\n
                                              explanation_uid=explanation_uid_list)\n
@@ -146,6 +148,8 @@ if builder is not None:\n
                             <string>getattr</string>
                             <string>None</string>
                             <string>builder</string>
+                            <string>path</string>
+                            <string>tag</string>
                             <string>expand_tag</string>
                             <string>build_tag</string>
                             <string>build_accounting_tag</string>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 904b8f9f1c..de697b51fa 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1222
\ No newline at end of file
+1223
\ No newline at end of file
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
index 51e285bb2e..f42ba38a38 100644
--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
@@ -81,9 +81,9 @@ order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(rule_reuference=
 \n
 for i in xrange(len(builder_list)):\n
     if i > 0:\n
-      after_tag = [expand_tag, \'%s_builder_%s\' % (order_path, i-1)]\n
+      after_tag = (tag, expand_tag, \'%s_builder_%s\' % (order_path, i-1))\n
     else:\n
-      after_tag = expand_tag\n
+      after_tag = (tag, expand_tag)\n
     builder_list[i].activate(\n
       activity=\'SQLQueue\',\n
       after_tag=after_tag,\n
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index 2be0b3c11a..8f6e44195d 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-442
\ No newline at end of file
+443
\ No newline at end of file
diff --git a/bt5/erp5_open_trade/bt/revision b/bt5/erp5_open_trade/bt/revision
index 19c7bdba7b..8e2afd3427 100644
--- a/bt5/erp5_open_trade/bt/revision
+++ b/bt5/erp5_open_trade/bt/revision
@@ -1 +1 @@
-16
\ No newline at end of file
+17
\ No newline at end of file
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
index e388ae25a9..623709cdc6 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
@@ -63,7 +63,7 @@ activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
 task.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 \n
 delivery_builder = task.portal_deliveries.task_report_builder\n
-delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=task.getUid())\n
+delivery_builder.activate(activity=\'SQLQueue\',after_tag=(tag, expand_tag)).build(explanation_uid=task.getUid())\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 475fbacb43..5d5ad96f9f 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-763
\ No newline at end of file
+764
\ No newline at end of file
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
index 341ba15a49..a1e22d6790 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
@@ -70,7 +70,7 @@ builder_dict = {\n
 }\n
 delivery_builder = getattr(order.portal_deliveries, builder_dict[order_portal_type])\n
 \n
-delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=order.getUid())\n
+delivery_builder.activate(activity=\'SQLQueue\', after_tag=(tag, expand_tag)).build(explanation_uid=order.getUid())\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index b475567cd6..cebfe35138 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-945
\ No newline at end of file
+946
\ No newline at end of file
-- 
2.30.9