diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_confirmPlanned.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_confirmPlanned.xml index 74a6fbf8348dc8797e2bbedf4124fd965dd3bfa1..409f85089248f822d3f86cf416ac9561beb24770 100644 --- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_confirmPlanned.xml +++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_confirmPlanned.xml @@ -52,7 +52,8 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ -if context.getSimulationState() == \'planned\' and context.getStartDate() < this_month:\n +isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n +if context.getSimulationState() == \'planned\' and context.getStartDate() < this_month and isTransitionPossible(context, \'confirm\'):\n context.confirm()\n diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stopConfirmed.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stopConfirmed.xml index 7ad4f396972a2abda84176abb889cf77a6e144bf..00df74172c30e7eae34317e8e7dd77c426b6fd9d 100644 --- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stopConfirmed.xml +++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stopConfirmed.xml @@ -50,9 +50,12 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if context.getSimulationState() == \'confirmed\' and len(context.checkConsistency()) == 0:\n - context.start()\n - context.stop()\n + <value> <string>isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n +if context.getSimulationState() == \'confirmed\' and len(context.checkConsistency()) == 0:\n + if isTransitionPossible(context, \'start\'):\n + context.start()\n + if isTransitionPossible(context, \'stop\'):\n + context.stop()\n </string> </value> </item> <item> diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index f5bba53e70b5b9a1c60705a0b0f5845a9d5b7823..bccf25b7889cc5f7b0cd7ba58f4b40ae15f65262 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -556 \ No newline at end of file +557 \ No newline at end of file