diff --git a/master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postGeneration.xml b/master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postGeneration.xml
index 1551352fa5e2e27a4465383675df8fce7017d4df..a92205885c07ca48748b483d8660680cfc0019ef 100644
--- a/master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postGeneration.xml
+++ b/master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postGeneration.xml
@@ -69,24 +69,12 @@ if invoice.getStartDate() is None:\n
   invoice.setStartDate(DateTime())\n
 \n
 # initialize accounting_workflow to planned state\n
-plan_tag = \'%s_plan\' % invoice.getPath()\n
 if invoice.getSimulationState() == \'draft\':\n
-  invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
-  (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),\n
-  tag=plan_tag).plan(comment=translateString(\'Initialised by Delivery Builder.\'))\n
-else:\n
-  # call builder just same as after script of \'plan\' transition\n
-  invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
-  (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),\n
-  tag=plan_tag).Delivery_expandAndBuild()\n
+  invoice.plan()\n
 \n
-# First set the invoice in the building state on the causality workflow\n
+# Update causality workflow\n
 invoice.startBuilding()\n
-\n
-# Then an activity should put the causality state in diverged or solved\n
-invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
-  (\'immediateReindexObject\',\'recursiveImmediateReindexObject\')),\n
-  after_tag=plan_tag).updateCausalityState()\n
+invoice.updateCausalityState()\n
 \n
 # update specialise from movements\n
 specialise_list = invoice.getSpecialiseList()\n
diff --git a/master/bt5/vifib_base/bt/revision b/master/bt5/vifib_base/bt/revision
index bbb3d18999890932e89458086ef2605644f068b7..903dc0f537a46162588c13bfb8932793de9e8169 100644
--- a/master/bt5/vifib_base/bt/revision
+++ b/master/bt5/vifib_base/bt/revision
@@ -1 +1 @@
-389
\ No newline at end of file
+390
\ No newline at end of file