From f0a1d9dc9c6020b1726236f354bb9299a73ea94c Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 23 Oct 2015 12:28:24 -0400
Subject: [PATCH] EX-85

---
 .../src/ProcessMaker/Project/Adapter/BpmnWorkflow.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 09d3d61cf..44cbcd12f 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -233,6 +233,16 @@ class BpmnWorkflow extends Project\Bpmn
             $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
         }
 
+        if ($activityBefore->getActTaskType() == "SCRIPTTASK" && $activityCurrent->getActTaskType() == "SCRIPTTASK") {
+            $taskData["TAS_TYPE"] = "SCRIPT-TASK";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+        }
+
+        if ($activityBefore->getActTaskType() == "EMPTY" && $activityCurrent->getActTaskType() == "EMPTY") {
+            $taskData["TAS_TYPE"] = "NORMAL";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+        }
+
         if ($activityBefore->getActTaskType() == "SCRIPTTASK" && $activityCurrent->getActTaskType() != "SCRIPTTASK") {
             $taskData["TAS_TYPE"] = "NORMAL";
             $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";