[Erp5-report] r35573 kazuhiko - in /erp5/trunk/bt5: erp5_accounting/WorkflowTemplateItem/po...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon May 24 16:25:55 CEST 2010 

Author: kazuhiko
Date: Mon May 24 16:25:54 2010
New Revision: 35573

URL: http://svn.erp5.org?rev=35573&view=rev
Log:
build() activity should wait for '(path)_updateAppliedRule' tag, otherwise it will be invoked too early.

Modified:
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision
    erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
    erp5/trunk/bt5/erp5_mrp/bt/revision
    erp5/trunk/bt5/erp5_open_trade/bt/revision
    erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
    erp5/trunk/bt5/erp5_project/bt/revision
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml [utf8] Mon May 24 16:25:54 2010
@@ -71,11 +71,13 @@
                   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 @@
 \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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon May 24 16:25:54 2010
@@ -1,1 +1,1 @@
-1222
+1223

Modified: erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml [utf8] Mon May 24 16:25:54 2010
@@ -81,9 +81,9 @@
 \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

Modified: erp5/trunk/bt5/erp5_mrp/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_mrp/bt/revision?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_mrp/bt/revision [utf8] Mon May 24 16:25:54 2010
@@ -1,1 +1,1 @@
-442
+443

Modified: erp5/trunk/bt5/erp5_open_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_open_trade/bt/revision?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_open_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_open_trade/bt/revision [utf8] Mon May 24 16:25:54 2010
@@ -1,1 +1,1 @@
-16
+17

Modified: erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml [utf8] Mon May 24 16:25:54 2010
@@ -63,7 +63,7 @@
 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>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Mon May 24 16:25:54 2010
@@ -1,1 +1,1 @@
-763
+764

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml [utf8] Mon May 24 16:25:54 2010
@@ -70,7 +70,7 @@
 }\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>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=35573&r1=35572&r2=35573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Mon May 24 16:25:54 2010
@@ -1,1 +1,1 @@
-945
+946

More information about the Erp5-report mailing list