diff --git a/module/task/model.php b/module/task/model.php
index bea8fd7a40..104e736e9e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -822,6 +822,11 @@ class taskModel extends model
             ->setDefault('assignedDate', $now)
             ->remove('comment,showModule')
             ->get();
+        if($oldTask->status != 'done' and $oldTask->status != 'closed' and $task->left == 0)
+        {
+            dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->left);
+            return false;
+        }
 
         if(!empty($oldTask->team))
         {
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index dca7f7b55c..befb86256e 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -39,10 +39,12 @@
           <th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
           <td class='w-p25-f'><?php echo html::select('assignedTo', $members, empty($task->team) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?></td><td></td>
         </tr>  
+        <?php if($task->status != 'done' and $task->status != 'closed'):?>
         <tr>
           <th><?php echo $lang->task->left;?></th>
           <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
         </tr>  
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
diff --git a/module/todo/model.php b/module/todo/model.php
index 4d56610740..6b755dd69d 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -530,10 +530,13 @@ class todoModel extends model
      */
     public function close($todoID)
     {
+        $now = helper::now();
         $this->dao->update(TABLE_TODO)
             ->set('status')->eq('closed')
             ->set('closedBy')->eq($this->app->user->account)
-            ->set('closedDate')->eq(helper::now())
+            ->set('closedDate')->eq($now)
+            ->set('assignedTo')->eq('closed')
+            ->set('assignedDate')->eq($now)
             ->where('id')->eq((int)$todoID)
             ->exec();
         $this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 30cd05a221..1ba716287f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -337,6 +337,7 @@ class upgradeModel extends model
             case '9_8_3':      $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.3'));
             case '10_0_alpha': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.alpha'));
             case '10_0_beta':  $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.beta'));
+            case '10_0':       $confirmContent .= file_get_contents($this->getUpgradeFile('10.0'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }