diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c5197e1709..4be2bdbdcc 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -342,6 +342,7 @@ $lang->admin->menu->cron      = array('link' => 'Cron|cron|index', 'subModule' =
 $lang->admin->menu->trashes   = array('link' => 'Recycle|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
 $lang->admin->menu->entry     = array('link' => 'API|entry|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook');
+$lang->admin->menu->score     = array('link' => 'Score|score|browse', 'subModule' => 'score');
 $lang->admin->menu->sso       = 'RangerTeam|admin|sso';
 
 $lang->convert   = new stdclass();
@@ -354,6 +355,7 @@ $lang->editor    = new stdclass();
 $lang->mail      = new stdclass();
 $lang->cron      = new stdclass();
 $lang->dev       = new stdclass();
+$lang->score     = new stdclass();
 $lang->entry     = new stdclass();
 $lang->webhook   = new stdclass();
 $lang->search    = new stdclass();
@@ -368,6 +370,7 @@ $lang->custom->menu    = $lang->admin->menu;
 $lang->editor->menu    = $lang->admin->menu;
 $lang->mail->menu      = $lang->admin->menu;
 $lang->dev->menu       = $lang->admin->menu;
+$lang->score->menu     = $lang->admin->menu;
 $lang->webhook->menu   = $lang->admin->menu;
 
 /* 菜单分组。*/
@@ -399,6 +402,7 @@ $lang->menugroup->custom      = 'admin';
 $lang->menugroup->editor      = 'admin';
 $lang->menugroup->mail        = 'admin';
 $lang->menugroup->dev         = 'admin';
+$lang->menugroup->score       = 'admin';
 $lang->menugroup->entry       = 'admin';
 $lang->menugroup->webhook     = 'admin';
 
@@ -519,44 +523,45 @@ $lang->icons['trash']     = 'trash';
 $lang->icons['extension'] = 'th-large';
 $lang->icons['app']       = 'th-large';
 
-$lang->icons['results']        = 'list-alt';
-$lang->icons['create']         = 'plus';
-$lang->icons['post']           = 'edit';
-$lang->icons['batchCreate']    = 'plus-sign';
-$lang->icons['batchEdit']      = 'edit-sign';
-$lang->icons['batchClose']     = 'off';
-$lang->icons['edit']           = 'pencil';
-$lang->icons['delete']         = 'remove';
-$lang->icons['copy']           = 'copy';
-$lang->icons['report']         = 'bar-chart';
-$lang->icons['export']         = 'download-alt';
-$lang->icons['report-file']    = 'file-powerpoint';
-$lang->icons['import']         = 'upload-alt';
-$lang->icons['finish']         = 'ok-sign';
-$lang->icons['resolve']        = 'ok-sign';
-$lang->icons['start']          = 'play';
-$lang->icons['restart']        = 'play';
-$lang->icons['run']            = 'play';
-$lang->icons['runCase']        = 'play';
-$lang->icons['batchRun']       = 'play-sign';
-$lang->icons['assign']         = 'hand-right';
-$lang->icons['assignTo']       = 'hand-right';
-$lang->icons['change']         = 'random';
-$lang->icons['link']           = 'link';
-$lang->icons['close']          = 'off';
-$lang->icons['activate']       = 'magic';
-$lang->icons['review']         = 'review';
-$lang->icons['confirm']        = 'search';
-$lang->icons['confirmBug']     = 'search';
-$lang->icons['putoff']         = 'calendar';
-$lang->icons['suspend']        = 'pause';
-$lang->icons['pause']          = 'pause';
-$lang->icons['cancel']         = 'ban-circle';
-$lang->icons['recordEstimate'] = 'time';
-$lang->icons['customFields']   = 'cogs';
-$lang->icons['manage']         = 'cog';
-$lang->icons['unlock']         = 'unlock-alt';
+$lang->icons['results']            = 'list-alt';
+$lang->icons['create']             = 'plus';
+$lang->icons['post']               = 'edit';
+$lang->icons['batchCreate']        = 'plus-sign';
+$lang->icons['batchEdit']          = 'edit-sign';
+$lang->icons['batchClose']         = 'off';
+$lang->icons['edit']               = 'pencil';
+$lang->icons['delete']             = 'remove';
+$lang->icons['copy']               = 'copy';
+$lang->icons['report']             = 'bar-chart';
+$lang->icons['export']             = 'download-alt';
+$lang->icons['report-file']        = 'file-powerpoint';
+$lang->icons['import']             = 'upload-alt';
+$lang->icons['finish']             = 'ok-sign';
+$lang->icons['resolve']            = 'ok-sign';
+$lang->icons['start']              = 'play';
+$lang->icons['restart']            = 'play';
+$lang->icons['run']                = 'play';
+$lang->icons['runCase']            = 'play';
+$lang->icons['batchRun']           = 'play-sign';
+$lang->icons['assign']             = 'hand-right';
+$lang->icons['assignTo']           = 'hand-right';
+$lang->icons['change']             = 'random';
+$lang->icons['link']               = 'link';
+$lang->icons['close']              = 'off';
+$lang->icons['activate']           = 'magic';
+$lang->icons['review']             = 'review';
+$lang->icons['confirm']            = 'search';
+$lang->icons['confirmBug']         = 'search';
+$lang->icons['putoff']             = 'calendar';
+$lang->icons['suspend']            = 'pause';
+$lang->icons['pause']              = 'pause';
+$lang->icons['cancel']             = 'ban-circle';
+$lang->icons['recordEstimate']     = 'time';
+$lang->icons['customFields']       = 'cogs';
+$lang->icons['manage']             = 'cog';
+$lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
+$lang->icons['score']              = 'tint';
 
 include (dirname(__FILE__) . '/menuOrder.php');
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index b960c80214..4083f474cf 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -342,6 +342,7 @@ $lang->admin->menu->cron      = array('link' => '计划任务|cron|index', 'subM
 $lang->admin->menu->trashes   = array('link' => '回收站|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
 $lang->admin->menu->entry     = array('link' => '接口|entry|browse', 'alias' => 'create,edit', 'subModule' => 'entry,webhook');
+$lang->admin->menu->score     = array('link' => '积分|score|browse', 'subModule' => 'score');
 $lang->admin->menu->sso       = '然之集成|admin|sso';
 
 $lang->convert   = new stdclass();
@@ -357,6 +358,7 @@ $lang->dev       = new stdclass();
 $lang->entry     = new stdclass();
 $lang->webhook   = new stdclass();
 $lang->search    = new stdclass();
+$lang->score     = new stdclass();
 
 $lang->convert->menu   = $lang->admin->menu;
 $lang->upgrade->menu   = $lang->admin->menu;
@@ -368,6 +370,7 @@ $lang->custom->menu    = $lang->admin->menu;
 $lang->editor->menu    = $lang->admin->menu;
 $lang->mail->menu      = $lang->admin->menu;
 $lang->dev->menu       = $lang->admin->menu;
+$lang->score->menu     = $lang->admin->menu;
 $lang->entry->menu     = $lang->admin->menu;
 $lang->webhook->menu   = $lang->admin->menu;
 
@@ -400,6 +403,7 @@ $lang->menugroup->custom      = 'admin';
 $lang->menugroup->editor      = 'admin';
 $lang->menugroup->mail        = 'admin';
 $lang->menugroup->dev         = 'admin';
+$lang->menugroup->score       = 'admin';
 $lang->menugroup->entry       = 'admin';
 $lang->menugroup->webhook     = 'admin';
 
@@ -520,44 +524,45 @@ $lang->icons['trash']     = 'trash';
 $lang->icons['extension'] = 'th-large';
 $lang->icons['app']       = 'th-large';
 
-$lang->icons['results']        = 'list-alt';
-$lang->icons['create']         = 'plus';
-$lang->icons['post']           = 'edit';
-$lang->icons['batchCreate']    = 'plus-sign';
-$lang->icons['batchEdit']      = 'edit-sign';
-$lang->icons['batchClose']     = 'off';
-$lang->icons['edit']           = 'pencil';
-$lang->icons['delete']         = 'remove';
-$lang->icons['copy']           = 'copy';
-$lang->icons['report']         = 'bar-chart';
-$lang->icons['export']         = 'download-alt';
-$lang->icons['report-file']    = 'file-powerpoint';
-$lang->icons['import']         = 'upload-alt';
-$lang->icons['finish']         = 'ok-sign';
-$lang->icons['resolve']        = 'ok-sign';
-$lang->icons['start']          = 'play';
-$lang->icons['restart']        = 'play';
-$lang->icons['run']            = 'play';
-$lang->icons['runCase']        = 'play';
-$lang->icons['batchRun']       = 'play-sign';
-$lang->icons['assign']         = 'hand-right';
-$lang->icons['assignTo']       = 'hand-right';
-$lang->icons['change']         = 'random';
-$lang->icons['link']           = 'link';
-$lang->icons['close']          = 'off';
-$lang->icons['activate']       = 'magic';
-$lang->icons['review']         = 'review';
-$lang->icons['confirm']        = 'search';
-$lang->icons['confirmBug']     = 'search';
-$lang->icons['putoff']         = 'calendar';
-$lang->icons['suspend']        = 'pause';
-$lang->icons['pause']          = 'pause';
-$lang->icons['cancel']         = 'ban-circle';
-$lang->icons['recordEstimate'] = 'time';
-$lang->icons['customFields']   = 'cogs';
-$lang->icons['manage']         = 'cog';
-$lang->icons['unlock']         = 'unlock-alt';
+$lang->icons['results']            = 'list-alt';
+$lang->icons['create']             = 'plus';
+$lang->icons['post']               = 'edit';
+$lang->icons['batchCreate']        = 'plus-sign';
+$lang->icons['batchEdit']          = 'edit-sign';
+$lang->icons['batchClose']         = 'off';
+$lang->icons['edit']               = 'pencil';
+$lang->icons['delete']             = 'remove';
+$lang->icons['copy']               = 'copy';
+$lang->icons['report']             = 'bar-chart';
+$lang->icons['export']             = 'download-alt';
+$lang->icons['report-file']        = 'file-powerpoint';
+$lang->icons['import']             = 'upload-alt';
+$lang->icons['finish']             = 'ok-sign';
+$lang->icons['resolve']            = 'ok-sign';
+$lang->icons['start']              = 'play';
+$lang->icons['restart']            = 'play';
+$lang->icons['run']                = 'play';
+$lang->icons['runCase']            = 'play';
+$lang->icons['batchRun']           = 'play-sign';
+$lang->icons['assign']             = 'hand-right';
+$lang->icons['assignTo']           = 'hand-right';
+$lang->icons['change']             = 'random';
+$lang->icons['link']               = 'link';
+$lang->icons['close']              = 'off';
+$lang->icons['activate']           = 'magic';
+$lang->icons['review']             = 'review';
+$lang->icons['confirm']            = 'search';
+$lang->icons['confirmBug']         = 'search';
+$lang->icons['putoff']             = 'calendar';
+$lang->icons['suspend']            = 'pause';
+$lang->icons['pause']              = 'pause';
+$lang->icons['cancel']             = 'ban-circle';
+$lang->icons['recordEstimate']     = 'time';
+$lang->icons['customFields']       = 'cogs';
+$lang->icons['manage']             = 'cog';
+$lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
+$lang->icons['score']              = 'tint';
 
 include (dirname(__FILE__) . '/menuOrder.php');
 
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index ec34be2292..d05ad0e980 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -341,6 +341,7 @@ $lang->admin->menu->safe      = array('link' => '安全|admin|safe', 'alias' =>
 $lang->admin->menu->cron      = array('link' => '計劃任務|cron|index', 'subModule' => 'cron');
 $lang->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
 $lang->admin->menu->dev       = array('link' => '二次開發|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
+$lang->admin->menu->score     = array('link' => '積分|score|browse', 'subModule' => 'score');
 $lang->admin->menu->sso       = '然之整合|admin|sso';
 
 $lang->convert   = new stdclass();
@@ -354,6 +355,7 @@ $lang->mail      = new stdclass();
 $lang->cron      = new stdclass();
 $lang->dev       = new stdclass();
 $lang->search    = new stdclass();
+$lang->score     = new stdclass();
 
 $lang->convert->menu   = $lang->admin->menu;
 $lang->upgrade->menu   = $lang->admin->menu;
@@ -365,6 +367,7 @@ $lang->custom->menu    = $lang->admin->menu;
 $lang->editor->menu    = $lang->admin->menu;
 $lang->mail->menu      = $lang->admin->menu;
 $lang->dev->menu       = $lang->admin->menu;
+$lang->scoret->menu    = $lang->admin->menu;
 
 /* 菜單分組。*/
 $lang->menugroup = new stdclass();
@@ -395,6 +398,7 @@ $lang->menugroup->custom      = 'admin';
 $lang->menugroup->editor      = 'admin';
 $lang->menugroup->mail        = 'admin';
 $lang->menugroup->dev         = 'admin';
+$lang->menugroup->score       = 'admin';
 
 /* 錯誤提示信息。*/
 $lang->error = new stdclass();
@@ -513,44 +517,45 @@ $lang->icons['trash']     = 'trash';
 $lang->icons['extension'] = 'th-large';
 $lang->icons['app']       = 'th-large';
 
-$lang->icons['results']        = 'list-alt';
-$lang->icons['create']         = 'plus';
-$lang->icons['post']           = 'edit';
-$lang->icons['batchCreate']    = 'plus-sign';
-$lang->icons['batchEdit']      = 'edit-sign';
-$lang->icons['batchClose']     = 'off';
-$lang->icons['edit']           = 'pencil';
-$lang->icons['delete']         = 'remove';
-$lang->icons['copy']           = 'copy';
-$lang->icons['report']         = 'bar-chart';
-$lang->icons['export']         = 'download-alt';
-$lang->icons['report-file']    = 'file-powerpoint';
-$lang->icons['import']         = 'upload-alt';
-$lang->icons['finish']         = 'ok-sign';
-$lang->icons['resolve']        = 'ok-sign';
-$lang->icons['start']          = 'play';
-$lang->icons['restart']        = 'play';
-$lang->icons['run']            = 'play';
-$lang->icons['runCase']        = 'play';
-$lang->icons['batchRun']       = 'play-sign';
-$lang->icons['assign']         = 'hand-right';
-$lang->icons['assignTo']       = 'hand-right';
-$lang->icons['change']         = 'random';
-$lang->icons['link']           = 'link';
-$lang->icons['close']          = 'off';
-$lang->icons['activate']       = 'magic';
-$lang->icons['review']         = 'review';
-$lang->icons['confirm']        = 'search';
-$lang->icons['confirmBug']     = 'search';
-$lang->icons['putoff']         = 'calendar';
-$lang->icons['suspend']        = 'pause';
-$lang->icons['pause']          = 'pause';
-$lang->icons['cancel']         = 'ban-circle';
-$lang->icons['recordEstimate'] = 'time';
-$lang->icons['customFields']   = 'cogs';
-$lang->icons['manage']         = 'cog';
-$lang->icons['unlock']         = 'unlock-alt';
+$lang->icons['results']            = 'list-alt';
+$lang->icons['create']             = 'plus';
+$lang->icons['post']               = 'edit';
+$lang->icons['batchCreate']        = 'plus-sign';
+$lang->icons['batchEdit']          = 'edit-sign';
+$lang->icons['batchClose']         = 'off';
+$lang->icons['edit']               = 'pencil';
+$lang->icons['delete']             = 'remove';
+$lang->icons['copy']               = 'copy';
+$lang->icons['report']             = 'bar-chart';
+$lang->icons['export']             = 'download-alt';
+$lang->icons['report-file']        = 'file-powerpoint';
+$lang->icons['import']             = 'upload-alt';
+$lang->icons['finish']             = 'ok-sign';
+$lang->icons['resolve']            = 'ok-sign';
+$lang->icons['start']              = 'play';
+$lang->icons['restart']            = 'play';
+$lang->icons['run']                = 'play';
+$lang->icons['runCase']            = 'play';
+$lang->icons['batchRun']           = 'play-sign';
+$lang->icons['assign']             = 'hand-right';
+$lang->icons['assignTo']           = 'hand-right';
+$lang->icons['change']             = 'random';
+$lang->icons['link']               = 'link';
+$lang->icons['close']              = 'off';
+$lang->icons['activate']           = 'magic';
+$lang->icons['review']             = 'review';
+$lang->icons['confirm']            = 'search';
+$lang->icons['confirmBug']         = 'search';
+$lang->icons['putoff']             = 'calendar';
+$lang->icons['suspend']            = 'pause';
+$lang->icons['pause']              = 'pause';
+$lang->icons['cancel']             = 'ban-circle';
+$lang->icons['recordEstimate']     = 'time';
+$lang->icons['customFields']       = 'cogs';
+$lang->icons['manage']             = 'cog';
+$lang->icons['unlock']             = 'unlock-alt';
 $lang->icons['confirmStoryChange'] = 'search';
+$lang->icons['score']              = 'tint';
 
 include (dirname(__FILE__) . '/menuOrder.php');
 
diff --git a/module/score/config.php b/module/score/config.php
index 07ccd10925..b3d9bbc7f3 100644
--- a/module/score/config.php
+++ b/module/score/config.php
@@ -1,7 +1 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午10:33
- */
\ No newline at end of file
diff --git a/module/score/control.php b/module/score/control.php
index 07ccd10925..08c3586b4f 100644
--- a/module/score/control.php
+++ b/module/score/control.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午10:33
- */
\ No newline at end of file
+ * The control file of score module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @author      Memory <lvtao@cnezsoft.com>
+ * @package     score
+ * @version     $Id: control.php $
+ * @link        http://www.zentao.net
+ */
+class score extends control
+{
+    /**
+     * score list
+     *
+     * @access public
+     * @return mixed
+     */
+    public function browse()
+    {
+        $this->view->title = $this->lang->score->common;
+        $this->display();
+    }
+}
\ No newline at end of file
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index 98a756efe6..b3d9bbc7f3 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -1,7 +1 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午11:51
- */
\ No newline at end of file
diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php
index 541c6749f1..917048ec31 100644
--- a/module/score/lang/zh-cn.php
+++ b/module/score/lang/zh-cn.php
@@ -1,7 +1,5 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午10:57
- */
\ No newline at end of file
+$lang->score->common = '积分';
+$lang->score->record = '积分记录';
+$lang->score->reset  = '重置积分';
+$lang->score->reset  = '重置积分';
diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php
index 98a756efe6..b3d9bbc7f3 100644
--- a/module/score/lang/zh-tw.php
+++ b/module/score/lang/zh-tw.php
@@ -1,7 +1 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午11:51
- */
\ No newline at end of file
diff --git a/module/score/model.php b/module/score/model.php
index 483521e74b..0f6f2ef07d 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -1,7 +1,14 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午10:32
- */
\ No newline at end of file
+ * The model file of score module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @author      Memory <lvtao@cnezsoft.com>
+ * @package     score
+ * @version     $Id: model.php $
+ * @link        http://www.zentao.net
+ */
+class scoreModel extends model
+{
+
+}
\ No newline at end of file
diff --git a/module/score/view/browse.html.php b/module/score/view/browse.html.php
index 1bfc4b1e6e..6845415fc1 100644
--- a/module/score/view/browse.html.php
+++ b/module/score/view/browse.html.php
@@ -1,7 +1,77 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: lvtao
- * Date: 2017/10/23
- * Time: 上午10:44
- */
\ No newline at end of file
+ * The browse view file of score module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Memory <lvtao@cnezsoft.com>
+ * @package     score
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id='titlebar'>
+    <div class='heading'><?php echo html::icon($lang->icons['score']);?> <?php echo $lang->score->record;?></div>
+    <div class='actions'>
+        <?php echo html::a(inLink('reset'), "<i class='icon-refresh'></i> " . $lang->score->reset, '', "class='btn'");?>
+    </div>
+</div>
+<table class='table tablesorter'>
+    <?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+    <thead>
+    <tr class='colhead'>
+        <th class='w-90px'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
+        <th class='w-id'>  <?php common::printOrderLink('objectID',   $orderBy, $vars, $lang->idAB);?></th>
+        <th><?php echo $lang->action->objectName;?></th>
+        <th class='w-100px'><?php common::printOrderLink('actor',     $orderBy, $vars, $lang->action->actor);?></th>
+        <th class='w-150px'><?php common::printOrderLink('date',      $orderBy, $vars, $lang->action->date);?></th>
+        <th class='w-100px'><?php echo $lang->actions;?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($trashes as $action):?>
+        <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
+        <tr class='text-center'>
+            <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
+            <td><?php echo $action->objectID;?></td>
+            <td class='text-left'>
+                <?php
+                $methodName = $module == 'caselib' ? 'libview' : 'view';
+                $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+                if($module == 'doclib')
+                {
+                    echo $action->objectName;
+                }
+                else
+                {
+                    echo html::a($this->createLink($module, $methodName, $params), $action->objectName);
+                }
+                ?>
+            </td>
+            <td><?php echo $users[$action->actor];?></td>
+            <td><?php echo $action->date;?></td>
+            <td>
+                <?php
+                common::printLink('action', 'undelete', "actionid=$action->id", $lang->action->undelete, 'hiddenwin');
+                if($type == 'all') common::printLink('action', 'hideOne',  "actionid=$action->id", $lang->action->hideOne, 'hiddenwin');
+                ?>
+            </td>
+        </tr>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot>
+    <tr>
+        <td colspan='6'>
+            <?php if($trashes and $type == 'all'):?>
+                <div class='table-actions clearfix'>
+                    <?php echo html::linkButton($lang->action->hideAll, inlink('hideAll'), 'hiddenwin');?>
+                    <div class='text'><?php echo $lang->action->trashTips;?></div>
+                </div>
+            <?php endif;?>
+            <?php $pager->show();?>
+        </td>
+    </tr>
+    </tfoot>
+</table>
+<?php include '../../common/view/footer.html.php';?>
\ No newline at end of file
diff --git a/module/task/model.php b/module/task/model.php
index 2e8c6c0355..886fce034f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -63,12 +63,12 @@ class taskModel extends model
                     $member->account  = $account;
                     $member->role     = $assignedTo;
                     $member->join     = helper::today();
-                    $member->estimate = $this->post->teamEstimate[$row] ? $this->post->teamEstimate[$row] : 0;
+                    $member->estimate = $this->post->teamEstimate[$row] ? (float)$this->post->teamEstimate[$row] : 0;
                     $member->left     = $member->estimate;
                     $member->order    = $row;
 
                     $teams[$account] = $member;
-                    $estimate        += (float)$member->eatimate;
+                    $estimate        += (float)$member->estimate;
                     $left            += (float)$member->left;
                 }