Merge branch 'sprint/167_xieqiyu_15561' into 'sprint/167'
* Fix bug#15561. See merge request easycorp/zentaopms!86
This commit is contained in:
@@ -1254,7 +1254,7 @@ class programModel extends model
|
||||
$hour->totalConsumed += $task->consumed;
|
||||
$hour->totalEstimate += $task->estimate;
|
||||
|
||||
if(strpos('cancel,closed', $task->status) !== false) $hour->totalLeft += $task->left;
|
||||
if(strpos('cancel,closed', $task->status) === false) $hour->totalLeft += $task->left;
|
||||
}
|
||||
}
|
||||
$hours[$projectID] = $hour;
|
||||
|
||||
Reference in New Issue
Block a user