From 21ba4055caf8d11323a286777ada132822902796 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 21 Oct 2020 13:16:12 +0800
Subject: [PATCH] * Fix bugs and add lang.

---
 module/common/lang/de.php                     |  3 +-
 module/common/lang/en.php                     |  1 +
 module/common/lang/fr.php                     |  1 +
 module/common/lang/vi.php                     |  3 +-
 module/group/control.php                      |  2 +-
 ...{managepgmadmin.css => manageprjadmin.css} |  0
 .../{managepgmadmin.js => manageprjadmin.js}  |  0
 module/group/lang/en.php                      |  1 +
 module/group/lang/resource.php                | 66 +++++++++++--------
 module/group/lang/zh-cn.php                   |  1 +
 ...admin.html.php => manageprjadmin.html.php} |  2 +-
 module/product/lang/de.php                    |  1 +
 module/product/lang/fr.php                    |  1 +
 module/product/lang/vi.php                    |  1 +
 module/program/lang/de.php                    |  1 +
 module/program/lang/en.php                    |  3 +-
 module/program/lang/fr.php                    |  1 +
 module/program/lang/vi.php                    |  1 +
 module/program/lang/zh-cn.php                 |  3 +-
 .../program/view/createstakeholder.html.php   |  2 +-
 module/story/lang/de.php                      |  1 +
 module/story/lang/en.php                      |  1 +
 module/story/lang/fr.php                      |  1 +
 module/story/lang/vi.php                      |  1 +
 module/story/lang/zh-cn.php                   |  1 +
 module/upgrade/lang/de.php                    | 40 +++++++++++
 module/upgrade/lang/en.php                    | 40 +++++++++++
 module/upgrade/lang/fr.php                    | 40 +++++++++++
 module/upgrade/lang/vi.php                    | 40 +++++++++++
 module/user/model.php                         |  2 +-
 30 files changed, 225 insertions(+), 36 deletions(-)
 rename module/group/css/{managepgmadmin.css => manageprjadmin.css} (100%)
 rename module/group/js/{managepgmadmin.js => manageprjadmin.js} (100%)
 rename module/group/view/{managepgmadmin.html.php => manageprjadmin.html.php} (99%)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 6e9add6090..e76f71bf63 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -159,7 +159,7 @@ $lang->product->viewMenu = new stdclass();
 $lang->product->viewMenu->requirement = array('link' => "Requirement|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->product->viewMenu->story       = array('link' => "Story|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->product->viewMenu->plan        = array('link' => "Plan|productplan|browse|productID=%s", 'subModule' => 'productplan');
-$lang->product->viewMenu->release     = array('link' => "Release|release|browse|productID=%s',     'subModule' => 'release');
+$lang->product->viewMenu->release     = array('link' => "Release|release|browse|productID=%s",     'subModule' => 'release');
 $lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->viewMenu->branch      = '@branch@|branch|manage|productID=%s';
 $lang->product->viewMenu->module      = 'Module|tree|browse|productID=%s&view=story';
@@ -581,6 +581,7 @@ $lang->navGroup->productplan = 'product';
 $lang->navGroup->release     = 'product';
 $lang->navGroup->branch      = 'product';
 
+$lang->navGroup->project     = 'project';
 $lang->navGroup->story       = 'project';
 $lang->navGroup->tree        = 'project';
 $lang->navGroup->task        = 'project';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index af143623b3..70d966dcb6 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -581,6 +581,7 @@ $lang->navGroup->productplan = 'product';
 $lang->navGroup->release     = 'product';
 $lang->navGroup->branch      = 'product';
 
+$lang->navGroup->project     = 'project';
 $lang->navGroup->story       = 'project';
 $lang->navGroup->tree        = 'project';
 $lang->navGroup->task        = 'project';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 058364b7a3..abfc807b9d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -581,6 +581,7 @@ $lang->navGroup->productplan = 'product';
 $lang->navGroup->release     = 'product';
 $lang->navGroup->branch      = 'product';
 
+$lang->navGroup->project     = 'project';
 $lang->navGroup->story       = 'project';
 $lang->navGroup->tree        = 'project';
 $lang->navGroup->task        = 'project';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 330479a148..c744e0c59a 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -257,7 +257,7 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index          = 'Home|my|index';
-$lang->my->menu->todo           = 'Todo|my|todo|';
+$lang->my->menu->calendar       = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');;
 $lang->my->menu->program        = array('link' => 'Program|my|program|');
 $lang->my->menu->task           = array('link' => 'Nhiệm vụ|my|task|', 'subModule' => 'task');
 $lang->my->menu->bug            = array('link' => 'Bug|my|bug|',   'subModule' => 'bug');
@@ -581,6 +581,7 @@ $lang->navGroup->productplan = 'product';
 $lang->navGroup->release     = 'product';
 $lang->navGroup->branch      = 'product';
 
+$lang->navGroup->project     = 'project';
 $lang->navGroup->story       = 'project';
 $lang->navGroup->tree        = 'project';
 $lang->navGroup->task        = 'project';
diff --git a/module/group/control.php b/module/group/control.php
index 99980eeffb..5fae995215 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -285,7 +285,7 @@ class group extends control
         $this->view->position     = $position;
         $this->view->allUsers     = $allUsers;
         $this->view->group        = $group;
-        $this->view->programs     = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->andWhere('isCat')->eq(0)->fetchPairs();
+        $this->view->programs     = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('type')->eq('project')->andWhere('deleted')->eq(0)->fetchPairs();
         $this->view->deptTree     = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManagePRJAdminLink'), $groupID);
         $this->view->groupUsers   = $groupUsers;
         $this->view->userPrograms = $userPrograms;
diff --git a/module/group/css/managepgmadmin.css b/module/group/css/manageprjadmin.css
similarity index 100%
rename from module/group/css/managepgmadmin.css
rename to module/group/css/manageprjadmin.css
diff --git a/module/group/js/managepgmadmin.js b/module/group/js/manageprjadmin.js
similarity index 100%
rename from module/group/js/managepgmadmin.js
rename to module/group/js/manageprjadmin.js
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index a1d72c3bea..ea06513865 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -26,6 +26,7 @@ $lang->group->confirmDelete      = 'Do you want to delete this user group?';
 $lang->group->successSaved       = 'Saved.';
 $lang->group->errorNotSaved      = 'Failed. Please select actions and groups.';
 $lang->group->viewList           = 'Access Sight';
+$lang->group->PRJ                = 'Manage Project';
 $lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Access Product';
 $lang->group->projectList        = 'Access Project';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 2b06041917..8b0c54f8d4 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -172,6 +172,9 @@ $lang->resource->program->PGMActivate          = 'PGMActivate';
 $lang->resource->program->PGMDelete            = 'PGMDelete';
 $lang->resource->program->PGMManageMembers     = 'PGMManageMembers';
 $lang->resource->program->PGMProject           = 'PGMProject';
+$lang->resource->program->PGMStakeholder       = 'PGMStakeholder';
+$lang->resource->program->createStakeholder    = 'createStakeholder';
+$lang->resource->program->unlinkStakeholder    = 'unlinkStakeholder';
 $lang->resource->program->export               = 'export';
 $lang->resource->program->index                = 'PRJIndex';
 $lang->resource->program->PRJBrowse            = 'PRJBrowse';
@@ -202,28 +205,31 @@ $lang->program->methodOrder[30]  = 'PGMView';
 $lang->program->methodOrder[35]  = 'PGMClose';
 $lang->program->methodOrder[40]  = 'PGMActivate';
 $lang->program->methodOrder[45]  = 'PGMDelete';
-$lang->program->methodOrder[85]  = 'PGMManageMembers';
-$lang->program->methodOrder[90]  = 'PGMProject';
-$lang->program->methodOrder[95]  = 'export';
-$lang->program->methodOrder[100] = 'PRJIndex';
-$lang->program->methodOrder[105] = 'PRJBrowse';
-$lang->program->methodOrder[110] = 'PRJProgramTitle';
-$lang->program->methodOrder[115] = 'PRJCreate';
-$lang->program->methodOrder[120] = 'PRJEdit';
-$lang->program->methodOrder[125] = 'PRJGroup';
-$lang->program->methodOrder[130] = 'PRJCreateGroup';
-$lang->program->methodOrder[135] = 'PRJManageView';
-$lang->program->methodOrder[140] = 'PRJManagePriv';
-$lang->program->methodOrder[145] = 'PRJManageMembers';
-$lang->program->methodOrder[150] = 'PRJManageGroupMember';
-$lang->program->methodOrder[155] = 'PRJCopyGroup';
-$lang->program->methodOrder[160] = 'PRJEditGroup';
-$lang->program->methodOrder[165] = 'PRJStart';
-$lang->program->methodOrder[170] = 'PRJSuspend';
-$lang->program->methodOrder[175] = 'PRJClose';
-$lang->program->methodOrder[180] = 'PRJActivate';
-$lang->program->methodOrder[185] = 'PRJUpdateOrder';
-$lang->program->methodOrder[190] = 'PRJDelete';
+$lang->program->methodOrder[50]  = 'PGMManageMembers';
+$lang->program->methodOrder[55]  = 'PGMProject';
+$lang->program->methodOrder[60]  = 'PGMStakeholder';
+$lang->program->methodOrder[65]  = 'createStakeholder';
+$lang->program->methodOrder[67]  = 'unlinkStakeholder';
+$lang->program->methodOrder[70]  = 'export';
+$lang->program->methodOrder[75]  = 'PRJIndex';
+$lang->program->methodOrder[80]  = 'PRJBrowse';
+$lang->program->methodOrder[85]  = 'PRJProgramTitle';
+$lang->program->methodOrder[90]  = 'PRJCreate';
+$lang->program->methodOrder[95]  = 'PRJEdit';
+$lang->program->methodOrder[100] = 'PRJGroup';
+$lang->program->methodOrder[105] = 'PRJCreateGroup';
+$lang->program->methodOrder[110] = 'PRJManageView';
+$lang->program->methodOrder[115] = 'PRJManagePriv';
+$lang->program->methodOrder[120] = 'PRJManageMembers';
+$lang->program->methodOrder[125] = 'PRJManageGroupMember';
+$lang->program->methodOrder[130] = 'PRJCopyGroup';
+$lang->program->methodOrder[135] = 'PRJEditGroup';
+$lang->program->methodOrder[140] = 'PRJStart';
+$lang->program->methodOrder[145] = 'PRJSuspend';
+$lang->program->methodOrder[150] = 'PRJClose';
+$lang->program->methodOrder[155] = 'PRJActivate';
+$lang->program->methodOrder[160] = 'PRJUpdateOrder';
+$lang->program->methodOrder[165] = 'PRJDelete';
 
 /* Personnel . */
 $lang->resource->personnel = new stdclass();
@@ -337,6 +343,7 @@ $lang->branch->methodOrder[10] = 'delete';
 $lang->resource->stakeholder = new stdclass();
 $lang->resource->stakeholder->browse       = 'browse';
 $lang->resource->stakeholder->create       = 'create';
+$lang->resource->stakeholder->batchCreate  = 'batchCreate';
 $lang->resource->stakeholder->edit         = 'edit';
 $lang->resource->stakeholder->delete       = 'delete';
 $lang->resource->stakeholder->view         = 'view';
@@ -353,6 +360,7 @@ $lang->resource->stakeholder->userIssue    = 'userIssue';
 
 $lang->stakeholder->methodOrder[5]  = 'browse';
 $lang->stakeholder->methodOrder[10] = 'create';
+$lang->stakeholder->methodOrder[13] = 'batchCreate';
 $lang->stakeholder->methodOrder[15] = 'edit';
 $lang->stakeholder->methodOrder[25] = 'delete';
 $lang->stakeholder->methodOrder[30] = 'view';
@@ -389,12 +397,13 @@ $lang->resource->story->bugs        = 'bugs';
 $lang->resource->story->cases       = 'cases';
 $lang->resource->story->zeroCase    = 'zeroCase';
 $lang->resource->story->report      = 'reportAction';
-$lang->resource->story->batchChangePlan   = 'batchChangePlan';
-$lang->resource->story->batchChangeBranch = 'batchChangeBranch';
-$lang->resource->story->batchChangeStage  = 'batchChangeStage';
-$lang->resource->story->batchAssignTo     = 'batchAssignTo';
-$lang->resource->story->batchChangeModule = 'batchChangeModule';
-$lang->resource->story->track             = 'track';
+$lang->resource->story->batchChangePlan    = 'batchChangePlan';
+$lang->resource->story->batchChangeBranch  = 'batchChangeBranch';
+$lang->resource->story->batchChangeStage   = 'batchChangeStage';
+$lang->resource->story->batchAssignTo      = 'batchAssignTo';
+$lang->resource->story->batchChangeModule  = 'batchChangeModule';
+$lang->resource->story->track              = 'track';
+$lang->resource->story->processStoryChange = 'processStoryChange';
 
 $lang->story->methodOrder[5]   = 'create';
 $lang->story->methodOrder[10]  = 'batchCreate';
@@ -421,6 +430,7 @@ $lang->story->methodOrder[110] = 'linkStory';
 $lang->story->methodOrder[115] = 'batchChangeBranch';
 $lang->story->methodOrder[120] = 'batchChangeModule';
 $lang->story->methodOrder[125] = 'track';
+$lang->story->methodOrder[130] = 'processStoryChange';
 
 /* Product plan. */
 $lang->resource->productplan = new stdclass();
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 50a621be09..7ad2be3471 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -26,6 +26,7 @@ $lang->group->confirmDelete      = '您确定删除该用户分组吗？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '没有保存，请确认选择了权限数据。';
 $lang->group->viewList           = '可访问视图';
+$lang->group->PRJ                = '可管理项目';
 $lang->group->programList        = '可访问项目集';
 $lang->group->productList        = '可访问' . $lang->productCommon;
 $lang->group->projectList        = '可访问项目';
diff --git a/module/group/view/managepgmadmin.html.php b/module/group/view/manageprjadmin.html.php
similarity index 99%
rename from module/group/view/managepgmadmin.html.php
rename to module/group/view/manageprjadmin.html.php
index d46d672b5d..d4f2c86332 100644
--- a/module/group/view/managepgmadmin.html.php
+++ b/module/group/view/manageprjadmin.html.php
@@ -39,7 +39,7 @@
           </td>
           <td class='pv-10px' colspan='2'>
             <div class='input-group'>
-              <span class='input-group-addon'> <?php echo $lang->group->program;?></span>
+              <span class='input-group-addon'> <?php echo $lang->group->PRJ;?></span>
               <?php echo html::select("program[$account][]", $programs, $program, "class='form-control chosen' multiple");?>
             </div>
           </td>
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index 0517e0fb98..8994c8e378 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -66,6 +66,7 @@ $lang->product->errorNoProduct = "Kein {$lang->productCommon} erstellt!";
 $lang->product->accessDenied   = "Sie haben keinen Zugriff auf {$lang->productCommon}.";
 
 $lang->product->id            = 'ID';
+$lang->product->program       = "Program";
 $lang->product->name          = 'Name';
 $lang->product->code          = 'Alias';
 $lang->product->line          = 'Produktlinie';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index f61eacd3e5..8e7b1a5ce7 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -66,6 +66,7 @@ $lang->product->errorNoProduct = "Aucun {$lang->productCommon} n'est créé pour
 $lang->product->accessDenied   = "Vous n'avez pas accès au {$lang->productCommon}.";
 
 $lang->product->id            = 'ID';
+$lang->product->program       = "Program";
 $lang->product->name          = "Nom du {$lang->productCommon}";
 $lang->product->code          = 'Code';
 $lang->product->line          = "Ligne Produit";
diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php
index a1243d0d80..3b673c3438 100644
--- a/module/product/lang/vi.php
+++ b/module/product/lang/vi.php
@@ -66,6 +66,7 @@ $lang->product->errorNoProduct = "Không có {$lang->productCommon} được t
 $lang->product->accessDenied   = "Bạn không có quyền truy cập tới  {$lang->productCommon} này.";
 
 $lang->product->id            = 'ID';
+$lang->product->program       = "Program";
 $lang->product->name          = "Tên {$lang->productCommon}";
 $lang->product->code          = 'Mã';
 $lang->product->line          = "Dòng {$lang->productCommon}";
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index bec5ae2d5e..bce310286d 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -177,6 +177,7 @@ $lang->program->PGMActivate          = 'Activate';
 $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create stakeholder';
+$lang->program->unlinkStakeholder    = 'Unlink stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index bec5ae2d5e..944977994e 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -176,7 +176,8 @@ $lang->program->PGMView              = 'Overview';
 $lang->program->PGMActivate          = 'Activate';
 $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
-$lang->program->createStakeholder    = 'Create stakeholder';
+$lang->program->createStakeholder    = 'Create Stakeholder';
+$lang->program->unlinkStakeholder    = 'Unlink Stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index bec5ae2d5e..bce310286d 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -177,6 +177,7 @@ $lang->program->PGMActivate          = 'Activate';
 $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create stakeholder';
+$lang->program->unlinkStakeholder    = 'Unlink stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index bec5ae2d5e..bce310286d 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -177,6 +177,7 @@ $lang->program->PGMActivate          = 'Activate';
 $lang->program->PGMExport            = 'Export';
 $lang->program->PGMStakeholder       = 'Stakeholder';
 $lang->program->createStakeholder    = 'Create stakeholder';
+$lang->program->unlinkStakeholder    = 'Unlink stakeholder';
 $lang->program->importStakeholder    = 'Import program';
 $lang->program->PGMManageMembers     = 'Program Team';
 
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 5d9b1bfedd..e9a5ba06ab 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -29,7 +29,7 @@ $lang->program->PRJUpdateOrder       = '排序';
 $lang->program->PRJSort              = '项目排序';
 
 /* Fields. */
-$lang->program->common             = '项目';
+$lang->program->common             = '项目集';
 $lang->program->stage              = '阶段';
 $lang->program->PRJName            = '项目名称';
 $lang->program->PRJModel           = '管理类型';
@@ -177,6 +177,7 @@ $lang->program->PGMActivate          = '激活项目集';
 $lang->program->PGMExport            = '导出';
 $lang->program->PGMStakeholder       = '干系人列表';
 $lang->program->createStakeholder    = '添加干系人';
+$lang->program->unlinkStakeholder    = '删除干系人';
 $lang->program->importStakeholder    = '从父项目集导入';
 $lang->program->PGMManageMembers     = '项目集团队';
 
diff --git a/module/program/view/createstakeholder.html.php b/module/program/view/createstakeholder.html.php
index 035149db2b..51e697cbee 100644
--- a/module/program/view/createstakeholder.html.php
+++ b/module/program/view/createstakeholder.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('programID', $programID);?>
-<?php $path = rtrim($program->path, ",$programID,") . ',';?>
+<?php $path = str_replace(",{$programID},", ',', "{$program->path}");?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'>
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index e2cca57ca8..3cde1c778d 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -39,6 +39,7 @@ $lang->story->subdivide         = 'Aufteilen';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Decompose Story';
 $lang->story->splitRequirent    = 'Decompose';
 $lang->story->close             = 'Schließen';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 61d50c95c3..a2dfdbe2d2 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -39,6 +39,7 @@ $lang->story->subdivide         = 'Decompose';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Decompose Story';
 $lang->story->splitRequirent    = 'Decompose';
 $lang->story->close             = 'Close';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index b527b53e19..92b45919a2 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -39,6 +39,7 @@ $lang->story->subdivide         = 'Décomposer';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Décomposer Story';
 $lang->story->splitRequirent    = 'Décompose';
 $lang->story->close             = 'Fermer';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 3afb40c529..05716aa677 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -39,6 +39,7 @@ $lang->story->subdivide         = 'Phân rã';
 $lang->story->link              = 'Link';
 $lang->story->unlink            = 'Unlink';
 $lang->story->track             = 'Track';
+$lang->story->processStoryChange= 'Process Story Change';
 $lang->story->subdivideAction   = 'Phân rã câu chuyện';
 $lang->story->splitRequirent    = 'Phân rã';
 $lang->story->close             = 'Đóng';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 09a703c750..7aea941301 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -39,6 +39,7 @@ $lang->story->subdivide         = '细分';
 $lang->story->link              = '关联';
 $lang->story->unlink            = '移除';
 $lang->story->track             = '跟踪矩阵';
+$lang->story->processStoryChange= '处理需求变更';
 $lang->story->subdivideAction   = "细分{$lang->storyCommon}";
 $lang->story->splitRequirent    = '拆分';
 $lang->story->close             = '关闭';
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index 3126e36f2b..6f1bd7d426 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -47,5 +47,45 @@ $lang->upgrade->forbiddenExt  = 'Die Erweiterung ist nicht kompatibel mit der Up
 $lang->upgrade->updateFile    = 'Updateinformation wurden hinzugefügt.';
 $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
+$lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
+$lang->upgrade->to20Desc      = <<<EOD
+<p>Dear users, thank you for your support of Zentao. Since version 20, Zentao Buddhism has been upgraded to a general purpose project management platform. Compared to previous versions, Zentao 20 adds the concept of a large project and management model. Next we will help you with this upgrade by using the wizard to go to. This upgrade is divided into two parts: Project data merge and permission reset.</p>
+<br />
+<h4>1、Project merge</h4>
+<p>We will merge the previous product and project data under the big project concept, and adjust the concept according to your choice of management model as follows：</p>
+<ul>
+  <li class='strong'>Scrum:Project > Product > Sprint > Task </li>
+  <li class='strong'>Waterfall:Project > Product > Stage > Task</li>
+  <li class='strong'>Kanban:Project > Product > Kanban > Card</li>
+</ul>
+<br />
+<h4>2、Permission Reset</h4>
+<p>Since the 20th version of Zentao, permissions are granted on a project basis, and the mechanism of authorization is:</p>
+<p class='strong'>The administrator delegates authority to the project manager > The project manager delegates authority to the project members</p>
+<br />
+<div class='text-warning'>
+  <p>Tips：</p>
+  <ol>
+    <li>You can start by installing a 20 version of Zen and experiencing the concepts and processes.</li>
+    <li>Zentao version 20 changes a lot, please make a backup before you upgrade.</li>
+  </ol>
+</div>
+EOD;
+
+$lang->upgrade->line     = 'Product Line';
+$lang->upgrade->program  = 'Merge Project';
+$lang->upgrade->existPGM = 'Existing projects';
+$lang->upgrade->PRJAdmin = 'Project Admin';
+$lang->upgrade->product  = $lang->productCommon;
+$lang->upgrade->project  = $lang->projectCommon;
+
+$lang->upgrade->newProgram         = 'Create';
+$lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s iterations in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:";
+$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
+$lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
+$lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
+$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 394a01f90d..6f37a5c4eb 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -47,5 +47,45 @@ $lang->upgrade->forbiddenExt  = 'The extension is incompatible with the version.
 $lang->upgrade->updateFile    = 'File information has to be updated.';
 $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
 $lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
+$lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
+$lang->upgrade->to20Desc      = <<<EOD
+<p>Dear users, thank you for your support of Zentao. Since version 20, Zentao Buddhism has been upgraded to a general purpose project management platform. Compared to previous versions, Zentao 20 adds the concept of a large project and management model. Next we will help you with this upgrade by using the wizard to go to. This upgrade is divided into two parts: Project data merge and permission reset.</p>
+<br />
+<h4>1、Project merge</h4>
+<p>We will merge the previous product and project data under the big project concept, and adjust the concept according to your choice of management model as follows：</p>
+<ul>
+  <li class='strong'>Scrum:Project > Product > Sprint > Task </li>
+  <li class='strong'>Waterfall:Project > Product > Stage > Task</li>
+  <li class='strong'>Kanban:Project > Product > Kanban > Card</li>
+</ul>
+<br />
+<h4>2、Permission Reset</h4>
+<p>Since the 20th version of Zentao, permissions are granted on a project basis, and the mechanism of authorization is:</p>
+<p class='strong'>The administrator delegates authority to the project manager > The project manager delegates authority to the project members</p>
+<br />
+<div class='text-warning'>
+  <p>Tips：</p>
+  <ol>
+    <li>You can start by installing a 20 version of Zen and experiencing the concepts and processes.</li>
+    <li>Zentao version 20 changes a lot, please make a backup before you upgrade.</li>
+  </ol>
+</div>
+EOD;
+
+$lang->upgrade->line     = 'Product Line';
+$lang->upgrade->program  = 'Merge Project';
+$lang->upgrade->existPGM = 'Existing projects';
+$lang->upgrade->PRJAdmin = 'Project Admin';
+$lang->upgrade->product  = $lang->productCommon;
+$lang->upgrade->project  = $lang->projectCommon;
+
+$lang->upgrade->newProgram         = 'Create';
+$lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s iterations in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:";
+$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
+$lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
+$lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
+$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 4de3feabb7..e84845ac2c 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -47,5 +47,45 @@ $lang->upgrade->forbiddenExt  = 'Cette extension est incompatible avec la versio
 $lang->upgrade->updateFile    = "Le fichier information a besoin d'une mise à jour.";
 $lang->upgrade->noticeSQL     = 'Votre base de donnée est inconsistente avec le standard et il y a eu un échec pour la corriger. Exécutez la commande SQL suivante et rafraichissez.';
 $lang->upgrade->afterDeleted  = "Le fichier n'est pas supprimé. Recommencez après l'avoir supprimé.";
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
+$lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
+$lang->upgrade->to20Desc      = <<<EOD
+<p>Dear users, thank you for your support of Zentao. Since version 20, Zentao Buddhism has been upgraded to a general purpose project management platform. Compared to previous versions, Zentao 20 adds the concept of a large project and management model. Next we will help you with this upgrade by using the wizard to go to. This upgrade is divided into two parts: Project data merge and permission reset.</p>
+<br />
+<h4>1、Project merge</h4>
+<p>We will merge the previous product and project data under the big project concept, and adjust the concept according to your choice of management model as follows：</p>
+<ul>
+  <li class='strong'>Scrum:Project > Product > Sprint > Task </li>
+  <li class='strong'>Waterfall:Project > Product > Stage > Task</li>
+  <li class='strong'>Kanban:Project > Product > Kanban > Card</li>
+</ul>
+<br />
+<h4>2、Permission Reset</h4>
+<p>Since the 20th version of Zentao, permissions are granted on a project basis, and the mechanism of authorization is:</p>
+<p class='strong'>The administrator delegates authority to the project manager > The project manager delegates authority to the project members</p>
+<br />
+<div class='text-warning'>
+  <p>Tips：</p>
+  <ol>
+    <li>You can start by installing a 20 version of Zen and experiencing the concepts and processes.</li>
+    <li>Zentao version 20 changes a lot, please make a backup before you upgrade.</li>
+  </ol>
+</div>
+EOD;
+
+$lang->upgrade->line     = 'Product Line';
+$lang->upgrade->program  = 'Merge Project';
+$lang->upgrade->existPGM = 'Existing projects';
+$lang->upgrade->PRJAdmin = 'Project Admin';
+$lang->upgrade->product  = $lang->productCommon;
+$lang->upgrade->project  = $lang->projectCommon;
+
+$lang->upgrade->newProgram         = 'Create';
+$lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s iterations in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:";
+$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
+$lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
+$lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
+$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php
index fe95ad8707..3f10a804a3 100644
--- a/module/upgrade/lang/vi.php
+++ b/module/upgrade/lang/vi.php
@@ -47,5 +47,45 @@ $lang->upgrade->forbiddenExt  = 'The extension is incompatible with the version.
 $lang->upgrade->updateFile    = 'File information has to be updated.';
 $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard and it failed to fix it. Vui lòng run the following SQL and refresh.';
 $lang->upgrade->afterDeleted  = 'File không là deleted. Vui lòng refresh after you xóa it.';
+$lang->upgrade->mergeProgram  = 'Data Merge';
+$lang->upgrade->to20Tips      = 'Zentao 20 upgrade tips';
+$lang->upgrade->to20Button    = 'I have done the backup, start the upgrade!！';
+$lang->upgrade->to20Desc      = <<<EOD
+<p>Dear users, thank you for your support of Zentao. Since version 20, Zentao Buddhism has been upgraded to a general purpose project management platform. Compared to previous versions, Zentao 20 adds the concept of a large project and management model. Next we will help you with this upgrade by using the wizard to go to. This upgrade is divided into two parts: Project data merge and permission reset.</p>
+<br />
+<h4>1、Project merge</h4>
+<p>We will merge the previous product and project data under the big project concept, and adjust the concept according to your choice of management model as follows：</p>
+<ul>
+  <li class='strong'>Scrum:Project > Product > Sprint > Task </li>
+  <li class='strong'>Waterfall:Project > Product > Stage > Task</li>
+  <li class='strong'>Kanban:Project > Product > Kanban > Card</li>
+</ul>
+<br />
+<h4>2、Permission Reset</h4>
+<p>Since the 20th version of Zentao, permissions are granted on a project basis, and the mechanism of authorization is:</p>
+<p class='strong'>The administrator delegates authority to the project manager > The project manager delegates authority to the project members</p>
+<br />
+<div class='text-warning'>
+  <p>Tips：</p>
+  <ol>
+    <li>You can start by installing a 20 version of Zen and experiencing the concepts and processes.</li>
+    <li>Zentao version 20 changes a lot, please make a backup before you upgrade.</li>
+  </ol>
+</div>
+EOD;
+
+$lang->upgrade->line     = 'Product Line';
+$lang->upgrade->program  = 'Merge Project';
+$lang->upgrade->existPGM = 'Existing projects';
+$lang->upgrade->PRJAdmin = 'Project Admin';
+$lang->upgrade->product  = $lang->productCommon;
+$lang->upgrade->project  = $lang->projectCommon;
+
+$lang->upgrade->newProgram         = 'Create';
+$lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s iterations in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:";
+$lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
+$lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
+$lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
+$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/user/model.php b/module/user/model.php
index b88ff08521..cad00cd359 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1363,7 +1363,7 @@ class userModel extends model
             $groups  = $this->dao->select('`group`')->from(TABLE_USERGROUP)->where('account')->eq($account)->fetchPairs('group', 'group');
             $groups  = ',' . join(',', $groups) . ',';
 
-            /* Init objects. * /
+            /* Init objects. */
             static $allProducts, $allPrograms, $allProjects, $allSprints, $teams, $stakeholders;
             if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id');
             if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id');