Merged in mcuiza/processmaker/PM-3276 (pull request #2751)

PM-3276
2015-09-10 13:10:51 -04:00
parent d7f56f0940 43d463532c
commit c95a9c6deb
1 changed files with 5 additions and 1 deletions
--- a/workflow/engine/classes/class.calendar.php
+++ b/workflow/engine/classes/class.calendar.php
@@ -392,6 +392,10 @@ class calendar extends CalendarDefinition
    	$hoursDuration = (float)$duration;
    	$newDate = $iniDate;
    	
+    	if ( G::toUpper($formatDuration) == 'MINUTES' ) {
+    		$hoursDuration = $duration / 60;
+    	}
+
    	while ($hoursDuration > 0) {
    		//$dataLog = array();
    		$newDate = $this->getIniDate($newDate);