Merged colosa/processmaker into master

This commit is contained in:
Quenta Ronald
2015-06-05 09:23:16 -04:00

View File

@@ -1010,7 +1010,7 @@ class CaseScheduler
case "UPD": case "UPD":
$arrayDataAux = $caseScheduler->load($caseSchedulerUid); $arrayDataAux = $caseScheduler->load($caseSchedulerUid);
$arrayCaseSchedulerData["SCH_END_DATE"] = $arrayData["SCH_END_DATE"]; $arrayCaseSchedulerData["SCH_END_DATE"] = ($arrayData["SCH_END_DATE"] != "")? $arrayData["SCH_END_DATE"] : null;
//If the start date has changed then recalculate the next run time //If the start date has changed then recalculate the next run time
$recalculateDate = ($arrayData["SCH_START_DATE"] == $arrayData["PREV_SCH_START_DATE"])? false : true; $recalculateDate = ($arrayData["SCH_START_DATE"] == $arrayData["PREV_SCH_START_DATE"])? false : true;