Merge branch 'fixbug_25216' into 'master'

Fixbug 25216 See merge request easycorp/zentaopms!4528
2022-07-14 01:46:40 +00:00
parent fe8f028590 a40ae1ee63
commit 1978dbd4b8
2 changed files with 1 additions and 2 deletions
@@ -1217,7 +1217,6 @@ class task extends control
            if($task->consumed - $estimate->consumed == 0)
            {
                $actionID = $this->loadModel('action')->create('task', $estimate->task, 'Adjusttasktowait');
-                $this->action->logHistory($actionID, $changes);
            }
            if($task->consumed - $estimate->consumed == 0)
            {
@@ -2842,7 +2842,7 @@ class taskModel extends model
        elseif($consumed == 0)
        {
            $data->status = 'wait';
-            $data->left   = $task->left + $estimate->consumed;
+            $data->left   = $task->estimate;
        }
        else
        {