From 4068624474b310039372fdf23561d5164364e484 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Wed, 4 May 2016 10:29:18 -0400
Subject: [PATCH] HOR-898

HOR-898
---
 workflow/engine/classes/class.derivation.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 1cf77ba18..e93693443 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -1098,7 +1098,7 @@ class Derivation
                         $taskDummy = TaskPeer::retrieveByPK($nextDel["TAS_UID_DUMMY"]);
                         if (preg_match("/^(?:END-MESSAGE-EVENT|END-EMAIL-EVENT)$/", $taskDummy->getTasType())) {
                             //Throw Events
-                            $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID_DUMMY"], $appFields, $flagFirstIteration, true);
+                            $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID_DUMMY"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
                         } else {
                             $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $nextDel['ROU_CONDITION']);
                         }
@@ -1178,8 +1178,12 @@ class Derivation
                     }
 
                     if ($canDerivate) {
+                        $rouCondition = '';
+                        if(isset($nextDel['ROU_CONDITION'])){
+                            $rouCondition = $nextDel['ROU_CONDITION'];
+                        }
                         //Throw Events
-                        $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true);
+                        $this->throwEventsBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields, $flagFirstIteration, true, $rouCondition);
 
                         //Derivate
                         $aSP = (isset($aSP))? $aSP : null;