Merge branch 'fixbug_21140' into 'master'

*Fixbug_21140

See merge request easycorp/zentaopms!3107

module/task/model.php

@@ -1641,7 +1641,7 @@ class taskModel extends model
         $data->lastEditedDate = $now;
         if(helper::isZeroDate($task->realStarted)) $data->realStarted = $now;
 
-        if($left == 0)
+        if($left == 0 and strpos('done,cancel,closed', $task->status) === false)
         {
             $data->status       = 'done';
             $data->assignedTo   = $task->openedBy;
@@ -1656,7 +1656,7 @@ class taskModel extends model
             $data->assignedDate = $now;
             $data->realStarted  = $earliestTime;
         }
-        elseif($task->status == 'pause')
+        elseif($left != 0 and strpos('done,cancel,closed,pause', $task->status) !== false)
         {
             $data->status       = 'doing';
             $data->assignedTo   = $this->app->user->account;

module/task/view/editestimate.html.php

@@ -25,7 +25,7 @@
           <th class='w-80px'><?php echo $lang->task->date;?></th>
           <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td>
           <td></td>
-        </tr>  
+        </tr>
         <tr>
           <th><?php echo $lang->task->record;?></th>
           <td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control"');?></td>
@@ -37,7 +37,7 @@
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
-        </tr>  
+        </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
         </tr>