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 27057c65e65a24cbf7916713bc9a7c1c16606948..697da6a3fbeb3b3943a1730f0e4c8fb54224a754 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,11 @@ builder = getattr(portal_deliveries,\n 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 @@ if builder is not None:\n \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 @@ if builder is not None:\n <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> diff --git a/bt5/erp5_accounting/bt/change_log b/bt5/erp5_accounting/bt/change_log index 21b5e02f079296335e2a89bf3ad609e5f2af0c81..584af26006a0aabcf70dc9555a3da712b5c3b5fa 100644 --- a/bt5/erp5_accounting/bt/change_log +++ b/bt5/erp5_accounting/bt/change_log @@ -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 diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 64e9c649eacc9a5f3fb81b0b7b12483fc4014ffd..ededf2852cc9888165397b273f1817b7ddf3b8cc 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1219 \ No newline at end of file +1220 \ No newline at end of file