diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml index 2fa7ad6e38a1c602c997d5de95157a30411cb11f..415ca5a4a2e7704a288464d764b08711eb1b07d1 100644 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml @@ -95,7 +95,7 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n \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 @@ if builder_by_ptype.has_key(delivery_portal_type) :\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 - 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 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n 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 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n <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> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index de697b51fa3dfd23b52ec39b1e18c4fa0a5765bb..7aee5ac823b11d24748bb849153c9dab0e77ed0d 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1223 \ No newline at end of file +1224 \ No newline at end of file