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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon May 24 14:36:02 2010
New Revision: 35561

URL: http://svn.erp5.org?rev=35561&view=rev
Log:
* Call Delivery_updateAppliedRule with activity in accounting_workflow/scripts/buildTradeModelLineList.

Modified:
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.xml
    erp5/trunk/bt5/erp5_accounting/bt/change_log
    erp5/trunk/bt5/erp5_accounting/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=35561&r1=35560&r2=35561&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 14:36:02 2010
@@ -71,11 +71,11 @@
                   builder_by_portal_type[delivery_portal_type],\n
                   None)\n
 \n
-update_applied_rule_tag = \'%s_updateAppliedRule\' % delivery.getPath()\n
+expand_tag = \'%s_expand\' % delivery.getPath()\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.Delivery_updateAppliedRule(activate_kw=dict(tag=update_applied_rule_tag))\n
+delivery.activate(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 +92,7 @@
 \n
   builder.activate(\n
       activity=\'SQLQueue\',\n
-      after_tag=update_applied_rule_tag,\n
+      after_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,7 +146,7 @@
                             <string>getattr</string>
                             <string>None</string>
                             <string>builder</string>
-                            <string>update_applied_rule_tag</string>
+                            <string>expand_tag</string>
                             <string>build_tag</string>
                             <string>build_accounting_tag</string>
                             <string>dict</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=35561&r1=35560&r2=35561&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log [utf8] Mon May 24 14:36:02 2010
@@ -1,3 +1,6 @@
+2010-05-24 kazuhiko
+* Call Delivery_updateAppliedRule with activity in accounting_workflow/scripts/buildTradeModelLineList.
+
 2010-05-24 Jérome
 * Allow to select multiple accounts root in General Ledger and Trial Balance
 

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35561&r1=35560&r2=35561&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon May 24 14:36:02 2010
@@ -1,1 +1,1 @@
-1219
+1220