[Erp5-report] r30852 - in /erp5/trunk/bt5/erp5_accounting: WorkflowTemplateItem/portal_work...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 24 18:12:45 CET 2009
Author: jerome
Date: Tue Nov 24 18:12:45 2009
New Revision: 30852
URL: http://svn.erp5.org?rev=30852&view=rev
Log:
specify missing tags / after tags
Modified:
erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/buildTradeModelLineList.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=30852&r1=30851&r2=30852&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] Tue Nov 24 18:12:45 2009
@@ -104,9 +104,6 @@
\n
\n
# build accounting lines\n
- method_id_list = (\'expand\', \'edit\', \'updateAppliedRule\', \'Delivery_updateAppliedRule\',\n
- \'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
-\n
explanation_uid_list = [delivery.getUid(), ]\n
packing_list = delivery.getCausalityValue(\n
portal_type=(\'Sale Packing List\',\n
@@ -119,24 +116,34 @@
if order is not None:\n
explanation_uid_list.append(order.getUid())\n
\n
-\n
- tag = \'invoice_transaction_build_%s\' % delivery.getRelativeUrl()\n
+ 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
+ update_applied_rule_tag = \'%s_updateAppliedRule\' % delivery.getPath()\n
builder.activate(\n
activity=\'SQLQueue\',\n
- after_path_and_method_id=(delivery.getPath(), method_id_list),\n
- after_tag=delivery.getPath() + \'_updateAppliedRule\',\n
- tag=tag,\n
- activate_kw=dict(tag=tag)).build(activate_kw=dict(tag=tag),\n
- explanation_uid=explanation_uid_list)\n
+ after_tag=(update_applied_rule_tag,\n
+ build_trade_model_tag,),\n
+ tag=build_accounting_tag,\n
+ activate_kw=dict(tag=build_accounting_tag)).build(\n
+ activate_kw=dict(tag=build_accounting_tag),\n
+ explanation_uid=explanation_uid_list)\n
\n
# build related payment transactions\n
portal_deliveries.payment_transaction_builder.activate(\n
- activity=\'SQLQueue\',\n
- after_method_id=method_id_list).build(explanation_uid=explanation_uid_list)\n
+ activity=\'SQLQueue\',\n
+ after_tag=( build_trade_model_tag,\n
+ update_applied_rule_tag,\n
+ build_accounting_tag, ),\n
+ ).build(\n
+ explanation_uid=explanation_uid_list)\n
\n
# set the object in building state.\n
delivery.startBuilding()\n
- delivery.activate(after_tag=tag).updateCausalityState()\n
+ delivery.activate(after_tag=(\n
+ build_trade_model_tag,\n
+ build_accounting_tag,)\n
+ ).updateCausalityState()\n
</string> </value>
</item>
<item>
@@ -190,11 +197,12 @@
<string>previous_tag</string>
<string>expand_tag</string>
<string>activate_kw</string>
- <string>method_id_list</string>
<string>explanation_uid_list</string>
<string>packing_list</string>
<string>order</string>
- <string>tag</string>
+ <string>build_trade_model_tag</string>
+ <string>build_accounting_tag</string>
+ <string>update_applied_rule_tag</string>
<string>dict</string>
</tuple>
</value>
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=30852&r1=30851&r2=30852&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] Tue Nov 24 18:12:45 2009
@@ -71,8 +71,9 @@
builder_by_portal_type[delivery_portal_type],\n
None)\n
\n
-update_applied_rule_tag = \'invoice_update_applied_rule_%s\' % delivery.getRelativeUrl()\n
+update_applied_rule_tag = \'%s_updateAppliedRule\' % 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
\n
@@ -94,11 +95,11 @@
after_tag=update_applied_rule_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
+ explanation_uid=explanation_uid_list)\n
\n
# set the object in building state.\n
delivery.startBuilding()\n
- delivery.activate(after_tag=build_tag).updateCausalityState()\n
+ delivery.activate(after_tag=(build_tag, build_accounting_tag)).updateCausalityState()\n
</string> </value>
</item>
<item>
@@ -147,6 +148,7 @@
<string>builder</string>
<string>update_applied_rule_tag</string>
<string>build_tag</string>
+ <string>build_accounting_tag</string>
<string>dict</string>
<string>explanation_uid_list</string>
<string>packing_list</string>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=30852&r1=30851&r2=30852&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Nov 24 18:12:45 2009
@@ -1,1 +1,1 @@
-1061
+1066
More information about the Erp5-report
mailing list