Commit 1da4a6dc authored by Jérome Perrin's avatar Jérome Perrin

specify missing tags / after tags

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30852 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e237f45b
......@@ -104,9 +104,6 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
\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 builder_by_ptype.has_key(delivery_portal_type) :\n
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
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
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 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
<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>
......
......@@ -71,8 +71,9 @@ builder = getattr(portal_deliveries,\n
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
......@@ -98,7 +99,7 @@ if builder is not None:\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 @@ if builder is not None:\n
<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>
......
1061
\ No newline at end of file
1066
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment