diff --git a/module/task/js/editestimate.js b/module/task/js/editestimate.js
new file mode 100644
index 0000000000..530f59bc9e
--- /dev/null
+++ b/module/task/js/editestimate.js
@@ -0,0 +1,4 @@
+function confirmLeft()
+{
+    if($('#left').val() === '0') return confirm(confirmRecord);
+}
diff --git a/module/task/js/recordestimate.js b/module/task/js/recordestimate.js
index 89b46d087b..ce1fcc0970 100644
--- a/module/task/js/recordestimate.js
+++ b/module/task/js/recordestimate.js
@@ -13,8 +13,5 @@ $("#recordForm").submit(function()
     {
         if($(this).val() !== '') left = $(this).val();
     });
-    if(left === '0')
-    {
-        return confirm(confirmRecord);
-    }
+    if(left === '0') return confirm(confirmRecord);
 });
diff --git a/module/task/model.php b/module/task/model.php
index a6d9536223..4d2ce1e8a8 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -462,12 +462,17 @@ class taskModel extends model
         {
             $task->status = 'doing'; 
         }
-        $this->dao->update(TABLE_TASK)
-            ->set('consumed')->eq($task->consumed + $consumed)
-            ->set('`left`')->eq($left)
-            ->set('status')->eq($task->status)
-            ->where('id')->eq($taskID)
-            ->exec();
+
+        $data = new stdClass();
+        $data->consumed       = $task->consumed + $consumed;
+        $data->left           = $left;
+        $data->status         = $task->status;
+        $data->lastEditedBy   = $this->app->user->account;
+        $data->lastEditedDate = helper::now();
+        if($left == 0) $data->finishedBy   = $this->app->user->account;
+        if($left == 0) $data->finishedDate = helper::now();
+
+        $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($taskID)->exec();
 
         $oldTask = new stdClass();
         $newTask = new stdClass();
@@ -858,10 +863,17 @@ class taskModel extends model
      */
     public function getEstimateById($estimateID)
     {
-        return $this->dao->select('*')
+        $estimate = $this->dao->select('*')
           ->from(TABLE_TASKESTIMATE)  
           ->where('id')->eq($estimateID)
           ->fetch();
+        $lastID = $this->dao->select('id')
+            ->from(TABLE_TASKESTIMATE)
+            ->where('task')->eq($estimate->task)
+            ->andWhere('id')->gt($estimate->id)
+            ->fetch('id');
+        $estimate->isLast = $lastID ? false :true; 
+        return $estimate;
     }
 
     /**
@@ -892,13 +904,18 @@ class taskModel extends model
         {
             $left = $task->left; 
         }
-        if($left == 0) $task->status = 'done'; 
-        $this->dao->update(TABLE_TASK)
-            ->set('consumed')->eq($consumed)
-            ->set('`left`')->eq($left)
-            ->set('status')->eq($task->status)
-            ->where('id')->eq($task->id)
-            ->exec();
+        if($left == 0) $task->status = 'done';
+
+        $data = new stdClass();
+        $data->consumed       = $consumed;
+        $data->left           = $left;
+        $data->status         = $task->status;
+        $data->lastEditedBy   = $this->app->user->account;
+        $data->lastEditedDate = helper::now();
+        if($left == 0) $data->finishedBy   = $this->app->user->account;
+        if($left == 0) $data->finishedDate = helper::now();
+
+        $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec();
 
         $oldTask = new stdClass();
         $newTask = new stdClass();
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index e3d28b77dc..d5558914bf 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -12,7 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<form method='post' target='hiddenwin'>
+<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
+<form method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
   <table class='table-1 a-left'> 
     <caption><?php echo $lang->task->editEstimate;?></caption>
     <tr>