Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into 185

db/update16.4.sql

@@ -1,4 +1,3 @@
-=======
 ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
 ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
 ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;

extension/lite/product/ext/view/browse.html.php

@@ -589,10 +589,6 @@ $(function()
                 checkedEstimate += data.estimate;
                 if(data.cases > 0) checkedCase += 1;
             });
-            var rate = Math.round(checkedCase / checkedTotal * 10000 / 100) + '' + '%';
-            return checkedSummary.replace('%total%', checkedTotal)
-                  .replace('%estimate%', checkedEstimate.toFixed(1))
-                  .replace('%rate%', rate);
         }
     });
 });

extension/lite/todo/ext/lang/zh-cn/lite.php

@@ -1,7 +1,5 @@
 <?php
 $lang->todo->typeList['task'] = '任务';
 
-$lang->effort->common = '日志';
-
 unset($lang->todo->typeList['bug']);
 unset($lang->todo->typeList['testtask']);