From 04f3174610bd5e9cee59d852828ad63711c3fe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 11 Dec 2008 12:28:10 +0000
Subject: [PATCH] use tag, activate_kw and after_tag so that
 updateCausalityState is done after build

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24861 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../accounting_workflow/scripts/Delivery_Build.xml | 14 +++++++++-----
 bt5/erp5_accounting/bt/revision                    |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
index 0338ba26c8..aff52e4632 100644
--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
@@ -102,21 +102,23 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
     return\n
   ### End of kev patch\n
 \n
-\n
-  # FIXME after_method_id is not enough here.\n
 \n
   # build accounting lines\n
   method_id_list = (\'expand\', \'edit\', \'updateAppliedRule\', \'Delivery_updateAppliedRule\',\n
-      \'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
+                    \'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
+\n
+  tag = \'invoice_transaction_build_%s\' % delivery.getRelativeUrl()\n
   builder.activate(\n
-      after_method_id=method_id_list).build()\n
+      after_method_id=method_id_list,\n
+      tag=tag,\n
+      activate_kw=dict(tag=tag)).build(activate_kw=dict(tag=tag))\n
 \n
   # build related payment transactions\n
   portal_deliveries.payment_transaction_builder.activate(after_method_id=method_id_list).build()\n
 \n
   # set the object in building state.\n
   delivery.startBuilding()\n
-  delivery.activate( after_path_and_method_id = (builder.getPath(), [\'build\']) ).updateCausalityState()\n
+  delivery.activate(after_tag=tag).updateCausalityState()\n
 </string> </value>
         </item>
         <item>
@@ -171,6 +173,8 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
                             <string>expand_tag</string>
                             <string>activate_kw</string>
                             <string>method_id_list</string>
+                            <string>tag</string>
+                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 2f9aa03afc..8eb7bc41bd 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-829
\ No newline at end of file
+830
\ No newline at end of file
-- 
2.30.9