diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php index 48f50b77f..24c968d2b 100755 --- a/workflow/engine/classes/class.calendar.php +++ b/workflow/engine/classes/class.calendar.php @@ -806,7 +806,9 @@ class calendar extends CalendarDefinition if ( G::toUpper($formatDuration) == 'DAYS' ) { $duration = $duration*$calendarData['HOURS_FOR_DAY']; } - + if ( G::toUpper($formatDuration) == 'MINUTES' ) { + $duration = $duration/60; + } $hoursDuration = (float)$duration; $newDate = $iniDate; diff --git a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml index e76b99ca2..ff97fac9a 100755 --- a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml +++ b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml @@ -10,7 +10,7 @@ - +