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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon May 24 16:52:40 2010
New Revision: 35575

URL: http://svn.erp5.org?rev=35575&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/Delivery_Build.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml?rev=35575&r1=35574&r2=35575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] Mon May 24 16:52:40 2010
@@ -95,7 +95,7 @@
 \n
     builder = pay_sheet.portal_deliveries.pay_sheet_transaction_builder\n
     builder.activate( activity  = \'SQLQueue\'\n
-                    , after_tag = expand_tag\n
+                    , after_tag = (tag, expand_tag)\n
                     , priority  = PRIORITY\n
                     ).build( explanation_uid = pay_sheet.getUid()\n
                            , activate_kw     = activate_kw\n
@@ -120,10 +120,13 @@
   build_trade_model_tag = \'invoice_transaction_build_trade_model_%s\' % \\\n
                                  delivery.getRelativeUrl()\n
   build_accounting_tag = \'invoice_transaction_build_accounting_%s\' % delivery.getRelativeUrl()\n
-  expand_tag = \'%s_expand\' % delivery.getPath()\n
+  path = delivery.getPath()\n
+  update_applied_rule_tag = \'%s_updateAppliedRule\' % path\n
+  expand_tag = \'%s_expand\' % path\n
   builder.activate(\n
       activity=\'SQLQueue\',\n
-      after_tag=(expand_tag,\n
+      after_tag=(update_applied_rule_tag,\n
+                 expand_tag,\n
                  build_trade_model_tag,),\n
       tag=build_accounting_tag,\n
       activate_kw=dict(tag=build_accounting_tag)).build(\n
@@ -134,6 +137,7 @@
   portal_deliveries.payment_transaction_builder.activate(\n
                       activity=\'SQLQueue\',\n
                       after_tag=( build_trade_model_tag,\n
+                                  update_applied_rule_tag,\n
                                   expand_tag,\n
                                   build_accounting_tag, ),\n
                       ).build(\n
@@ -204,6 +208,8 @@
                             <string>order</string>
                             <string>build_trade_model_tag</string>
                             <string>build_accounting_tag</string>
+                            <string>path</string>
+                            <string>update_applied_rule_tag</string>
                             <string>dict</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35575&r1=35574&r2=35575&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon May 24 16:52:40 2010
@@ -1,1 +1,1 @@
-1223
+1224