diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index ddca0e8fb7..631884a6ed 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -99,9 +99,9 @@
           <?php if($type != 'finishedBy'): ?>
           <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
           <?php endif;?>
-          <td class='c-hours'><?php echo round($task->estimate, 1);?></td>
-          <td class='c-hours'><?php echo round($task->consumed, 1);?></td>
-          <td class='c-hours'><?php echo round($task->left, 1);?></td>
+          <td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->estimate, 1) . ' ' . $lang->project->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->consumed, 1) . ' ' . $lang->project->workHourUnit;?></td>
+          <td class='c-hours' title="<?php echo round($task->left,     1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->left,     1) . ' ' . $lang->project->workHourUnit;?></td>
           <td class='c-status'>
             <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
             <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
diff --git a/module/product/control.php b/module/product/control.php
index 8dbf310e2d..51809e5ffa 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -123,7 +123,7 @@ class product extends control
     public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Lower browse type. */
-        $browseType             = strtolower($browseType);
+        $browseType = strtolower($browseType);
 
         /* Load datatable. */
         $this->loadModel('datatable');
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 85ef809a51..61529d7ea6 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -31,6 +31,7 @@ $lang->project->to             = 'An';
 $lang->project->days           = 'Manntage';
 $lang->project->day            = 'Tag';
 $lang->project->workHour       = 'Stunden';
+$lang->project->workHourUnit   = 'H';
 $lang->project->totalHours     = 'Arbeitsstunden';
 $lang->project->totalDays      = 'Arbeitstage';
 $lang->project->status         = 'Status';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index dfa3462df5..421decfb13 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -31,6 +31,7 @@ $lang->project->to             = 'To';
 $lang->project->days           = 'Available Days';
 $lang->project->day            = ' Days';
 $lang->project->workHour       = ' Hours';
+$lang->project->workHourUnit   = 'H';
 $lang->project->totalHours     = 'Available Hours';
 $lang->project->totalDays      = 'Available Days';
 $lang->project->status         = 'Status';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index bd48158bb0..0d4fd92a38 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -31,6 +31,7 @@ $lang->project->to             = 'à';
 $lang->project->days           = 'Budget Jours';
 $lang->project->day            = ' Jours';
 $lang->project->workHour       = ' Heures';
+$lang->project->workHourUnit   = 'H';
 $lang->project->totalHours     = 'Budget (Heure)';
 $lang->project->totalDays      = 'Budget (Jour)';
 $lang->project->status         = 'Statut';
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 37c33fc8d6..34e73da984 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -31,6 +31,7 @@ $lang->project->to             = 'Tới';
 $lang->project->days           = 'Ngày khả dụng';
 $lang->project->day            = ' ngày';
 $lang->project->workHour       = 'giờ';
+$lang->project->workHourUnit   = 'H';
 $lang->project->totalHours     = 'Giờ khả dụng';
 $lang->project->totalDays      = 'Ngày khả dụng';
 $lang->project->status         = 'Tình trạng';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 1585661676..6743ec7b98 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -31,6 +31,7 @@ $lang->project->to             = '至';
 $lang->project->days           = '可用工作日';
 $lang->project->day            = '天';
 $lang->project->workHour       = '工时';
+$lang->project->workHourUnit   = 'H';
 $lang->project->totalHours     = '可用工时';
 $lang->project->totalDays      = '可用工日';
 $lang->project->status         = $lang->executionCommon . '状态';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 76b07aa60e..a7aec57e1a 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -31,6 +31,7 @@ $lang->project->to            = '至';
 $lang->project->days          = '可用工作日';
 $lang->project->day           = '天';
 $lang->project->workHour      = '工時';
+$lang->project->workHourUnit  = 'H';
 $lang->project->totalHours    = '可用工時';
 $lang->project->totalDays     = '可用工日';
 $lang->project->status        = $lang->executionCommon . '狀態';
diff --git a/module/task/model.php b/module/task/model.php
index 85a54feb54..dfe1a055bd 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2926,6 +2926,11 @@ class taskModel extends model
                 if(!empty($task->children)) $class .= ' has-child';
             }
             if($id == 'story') $title = " title='{$task->storyTitle}'";
+            if($id == 'estimate' || $id == 'consumed' || $id == 'left')
+            {
+                $value = round($task->$id, 1);
+                $title = " title='{$value} {$this->lang->project->workHour}'";
+            }
 
             echo "<td class='" . $class . "'" . $title . ">";
             if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('task', $task, $id);
@@ -2963,13 +2968,13 @@ class taskModel extends model
                 $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");
                 break;
             case 'estimate':
-                echo round($task->estimate, 1);
+                echo round($task->estimate, 1) . ' ' . $this->lang->project->workHourUnit;
                 break;
             case 'consumed':
-                echo round($task->consumed, 1);
+                echo round($task->consumed, 1) . ' ' . $this->lang->project->workHourUnit;
                 break;
             case 'left':
-                echo round($task->left, 1);
+                echo round($task->left, 1)     . ' ' . $this->lang->project->workHourUnit;
                 break;
             case 'progress':
                 echo "{$task->progress}%";