diff --git a/db/update20.0.sql b/db/update20.0.sql index 0476f7282d..33f341a360 100644 --- a/db/update20.0.sql +++ b/db/update20.0.sql @@ -69,15 +69,11 @@ CREATE TABLE `zt_design` ( `commit` text NOT NULL, `project` mediumint(9) NOT NULL DEFAULT '0', `name` varchar(255) NOT NULL, - `parent` mediumint(8) unsigned NOT NULL, `status` varchar(30) NOT NULL, - `subStatus` varchar(30) NOT NULL, `createdBy` varchar(30) NOT NULL, `createdDate` datetime NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, - `commitBy` varchar(30) NOT NULL, - `commitDate` datetime NOT NULL, `assignedTo` varchar(30) NOT NULL, `assignedBy` varchar(30) NOT NULL, `assignedDate` datetime NOT NULL, diff --git a/db/zentao.sql b/db/zentao.sql index 5244e52c86..8570bd5b6a 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -317,15 +317,11 @@ CREATE TABLE `zt_design` ( `commit` varchar(30) NOT NULL, `project` mediumint(9) NOT NULL DEFAULT '0', `name` varchar(255) NOT NULL, - `parent` mediumint(8) unsigned NOT NULL, `status` varchar(30) NOT NULL, - `subStatus` varchar(30) NOT NULL, `createdBy` varchar(30) NOT NULL, `createdDate` datetime NOT NULL, `editedBy` varchar(30) NOT NULL, `editedDate` datetime NOT NULL, - `commitBy` varchar(30) NOT NULL, - `commitDate` datetime NOT NULL, `assignedTo` varchar(30) NOT NULL, `assignedBy` varchar(30) NOT NULL, `assignedDate` datetime NOT NULL, diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 1dadda2fd2..06d9329f6f 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -146,7 +146,7 @@ $lang->program->viewMenu->project = array('link' => "项目|program|pgmproject|p $lang->product = new stdclass(); $lang->product->menu = new stdclass(); $lang->product->menu->home = '主页|product|index|'; -$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create'); +$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); $lang->product->viewMenu->requirement = array('link' => "用户需求|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); diff --git a/module/program/view/pgmproduct.html.php b/module/program/view/pgmproduct.html.php index d7a9498f54..c1e7e7a4d8 100644 --- a/module/program/view/pgmproduct.html.php +++ b/module/program/view/pgmproduct.html.php @@ -24,7 +24,7 @@
-
id");?>'> + id");?>'> diff --git a/module/workestimation/lang/en.php b/module/workestimation/lang/en.php index 5d14a75574..fbf958d3e4 100644 --- a/module/workestimation/lang/en.php +++ b/module/workestimation/lang/en.php @@ -12,6 +12,7 @@ $lang->workestimation->hour = 'Man-hour'; $lang->workestimation->consumed = 'Cost Man-hours'; $lang->workestimation->programScaleTip = "Actual scale of current project: %s{$lang->hourCommon} uses "; +$lang->workestimation->tips = 'Estimate the duration of the project only after the estimate of the workload has been completed'; $lang->workestimation->placeholder = new stdclass(); $lang->workestimation->placeholder->scale = ''; diff --git a/module/workestimation/lang/zh-cn.php b/module/workestimation/lang/zh-cn.php index 17889a4a82..7977fd68cd 100644 --- a/module/workestimation/lang/zh-cn.php +++ b/module/workestimation/lang/zh-cn.php @@ -12,6 +12,7 @@ $lang->workestimation->hour = '工时'; $lang->workestimation->consumed = '已消耗工时'; $lang->workestimation->programScaleTip = "当前项目实际规模:%s{$lang->hourCommon} 使用"; +$lang->workestimation->tips = '完成工作量估算后,才能进行工期估算'; $lang->workestimation->placeholder = new stdclass(); $lang->workestimation->placeholder->scale = ''; diff --git a/module/workestimation/view/index.html.php b/module/workestimation/view/index.html.php index b55e9ef9c3..28c4afc650 100644 --- a/module/workestimation/view/index.html.php +++ b/module/workestimation/view/index.html.php @@ -86,6 +86,7 @@
+
workestimation->tips;?>