From 331790b9b55caf093b0a3067fe733620586a50f2 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 20 Nov 2015 16:21:44 -0400
Subject: [PATCH 1/2] PM-4123

---
 workflow/engine/classes/class.derivation.php                   | 3 +++
 .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index d4c7de6af..25a700586 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -605,6 +605,9 @@ class Derivation
                 break;
             case "MULTIPLE_INSTANCE":
                 $userFields = $this->getUsersFullNameFromArray($this->getAllUsersFromAnyTask($nextAssignedTask["TAS_UID"]));
+                if(empty($userFields)){
+                    throw (new Exception( G::LoadTranslation( 'ID_NO_USERS' ) ));
+                }
                 break;
             case "MULTIPLE_INSTANCE_VALUE_BASED":
                 $arrayApplicationData = $this->case->loadCase($tasInfo["APP_UID"]);
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 6a0fb9fa8..9ac91b14f 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -255,7 +255,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         if($activityCurrent->getActLoopType() == "PARALLEL"){
            $task = \TaskPeer::retrieveByPK($actUid);
-           if($task->getTasAssignType() == "BALANCED"){
+           if($task->getTasAssignType() == "BALANCED" || $task->getTasAssignType() == "MANUAL" || $task->getTasAssignType() == "EVALUATE" || $task->getTasAssignType() == "REPORT_TO" || $task->getTasAssignType() == "SELF_SERVICE"){
                $taskData["TAS_ASSIGN_TYPE"] = "MULTIPLE_INSTANCE";
            }
         }

From ca05c0913659d5c6e85c5cd05ba590a94237162e Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 20 Nov 2015 18:55:30 -0400
Subject: [PATCH 2/2] PM-4123

---
 workflow/engine/classes/model/Task.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workflow/engine/classes/model/Task.php b/workflow/engine/classes/model/Task.php
index 524ed3cc1..7654164b6 100755
--- a/workflow/engine/classes/model/Task.php
+++ b/workflow/engine/classes/model/Task.php
@@ -804,6 +804,7 @@ class Task extends BaseTask
                 $oCriteria = new Criteria();
                 $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN");
                 $oCriteria->add(AppDelegationPeer::TAS_UID, $newValues['TAS_UID']);
+                $oCriteria->add(AppDelegationPeer::USR_UID, "");
                 $oApplication = AppDelegationPeer::doSelectOne($oCriteria);
                 if(!empty($oApplication)) {
                     throw (new Exception(G::LoadTranslation('ID_CURRENT_ASSING_TYPE_WITH_CASES')));