From a5607fbb6b4433ce4a3e912caf6db349d8a1613c Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 18 Jan 2021 10:16:36 +0800
Subject: [PATCH 1/9] * Finish task #8988.

---
 module/programplan/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 800a615567..a15435a642 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -36,7 +36,7 @@
           <th class='w-110px'>
             <?php echo $lang->programplan->percent;?>
             <?php if($planID):?>
-            <i class='icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content=<?php echo $lang->programplan->workloadTips;?>></i>
+            <i class='icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-container="body" data-content=<?php echo $lang->programplan->workloadTips;?>></i>
             <?php endif;?>
           </th>
           <th class='w-110px <?php echo $hideAttribute?>'><?php echo $lang->programplan->attribute;?></th>

From 02228d9f5ab6b351189b3d99866d4290bb4b01f2 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 18 Jan 2021 10:58:18 +0800
Subject: [PATCH 2/9] * Finish task #8988.

---
 module/programplan/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 823f71c1ac..d02e830b11 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -644,6 +644,7 @@ class programplanModel extends model
 
             $childrenTotalPercent = $this->getTotalPercent($parentStage, true);
             $childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent);
+            if($childrenTotalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
 
             /* If child plan has milestone, update parent plan set milestone eq 0 . */
             if($plan->milestone and $parentStage->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec();

From c40e49b3c093325532237c34b258822914bf6bce Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 18 Jan 2021 10:58:54 +0800
Subject: [PATCH 3/9] * Finish task #9002.

---
 module/my/view/team.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/my/view/team.html.php b/module/my/view/team.html.php
index 1b7ff4405e..252580a754 100644
--- a/module/my/view/team.html.php
+++ b/module/my/view/team.html.php
@@ -37,7 +37,7 @@ include '../../common/view/header.html.php';
         <?php foreach($users as $user):?>
         <tr>
           <td class='c-id'><?php printf('%03d', $user->id);?></td>
-          <td><?php if(!common::printLink('user', 'view', "userID=$user->id&from=my", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
+          <td><?php if(!common::printLink('user', 'view', "userID=$user->id&from=my", $user->realname, '', "title='$user->realname' data-group='my'")) echo $user->realname;?></td>
           <td><?php echo $user->account;?></td>
           <td class="w-90px" title='<?php echo zget($lang->user->roleList, $user->role, '');?>'><?php echo zget($lang->user->roleList, $user->role, '');?></td>
           <td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>

From 9c5cfa592d9189818c4147b4f7010ddc40715cd1 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 18 Jan 2021 14:17:44 +0800
Subject: [PATCH 4/9] * Finish task#8963.

---
 module/program/control.php             | 49 +++++++++++++++-----------
 module/program/model.php               | 19 +++-------
 module/program/view/pgmcreate.html.php |  2 +-
 module/program/view/pgmedit.html.php   |  2 +-
 module/program/view/prjcreate.html.php |  9 +++--
 module/program/view/prjedit.html.php   |  9 +++--
 6 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 27f6f139be..b98d158cdf 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -887,31 +887,34 @@ class program extends control
             }
         }
 
-        $allProducts = $this->program->getPGMProductPairs($programID);
+        $allProducts   = $this->program->getPGMProductPairs($programID);
+        $parentProgram = $this->program->getPGMByID($programID);
 
         $this->view->title      = $this->lang->program->PRJCreate;
         $this->view->position[] = $this->lang->program->PRJCreate;
 
-        $this->view->pmUsers       = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst');
-        $this->view->users         = $this->user->getPairs('noclosed|nodeleted');
-        $this->view->copyProjects  = $this->program->getPRJPairsByModel();
-        $this->view->products      = $products;
-        $this->view->allProducts   = array('0' => '') + $allProducts;
-        $this->view->productPlans  = array('0' => '') + $productPlans;
-        $this->view->branchGroups  = $this->loadModel('branch')->getByProducts(array_keys($products));
-        $this->view->programID     = $programID;
-        $this->view->model         = $model;
-        $this->view->name          = $name;
-        $this->view->code          = $code;
-        $this->view->team          = $team;
-        $this->view->acl           = $acl;
-        $this->view->auth          = $auth;
-        $this->view->whitelist     = $whitelist;
-        $this->view->copyProjectID = $copyProjectID;
-        $this->view->from          = $from;
-        $this->view->programList   = $this->program->getParentPairs();
-        $this->view->parentProgram = $this->program->getPGMByID($programID);
-        $this->view->URSRPairs     = $this->loadModel('custom')->getURSRPairs();
+        $this->view->pmUsers        = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst');
+        $this->view->users          = $this->user->getPairs('noclosed|nodeleted');
+        $this->view->copyProjects   = $this->program->getPRJPairsByModel();
+        $this->view->products       = $products;
+        $this->view->allProducts    = array('0' => '') + $allProducts;
+        $this->view->productPlans   = array('0' => '') + $productPlans;
+        $this->view->branchGroups   = $this->loadModel('branch')->getByProducts(array_keys($products));
+        $this->view->programID      = $programID;
+        $this->view->model          = $model;
+        $this->view->name           = $name;
+        $this->view->code           = $code;
+        $this->view->team           = $team;
+        $this->view->acl            = $acl;
+        $this->view->auth           = $auth;
+        $this->view->whitelist      = $whitelist;
+        $this->view->copyProjectID  = $copyProjectID;
+        $this->view->from           = $from;
+        $this->view->programList    = $this->program->getParentPairs();
+        $this->view->parentProgram  = $parentProgram;
+        $this->view->URSRPairs      = $this->loadModel('custom')->getURSRPairs();
+        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram);
+        $this->view->budgetUnitList = $this->program->getBudgetUnitList();
 
         $this->display();
     }
@@ -963,6 +966,7 @@ class program extends control
         $productPlans   = array(0 => '');
         $allProducts    = $programID != $project->parent ? $this->program->getPGMProductPairs($programID) : $this->program->getPGMProductPairs($project->parent, 'assign', 'noclosed');
         $linkedProducts = $programID != $project->parent ? array() : $this->project->getProducts($projectID);
+        $parentProgram  = $this->program->getPGMByID($programID);
 
         foreach($linkedProducts as $product)
         {
@@ -989,6 +993,9 @@ class program extends control
         $this->view->branchGroups   = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
         $this->view->URSRPairs      = $this->loadModel('custom')->getURSRPairs();
         $this->view->from           = $from;
+        $this->view->parentProgram  = $parentProgram;
+        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram);
+        $this->view->budgetUnitList = $this->program->getBudgetUnitList();
 
         $this->display();
     }
diff --git a/module/program/model.php b/module/program/model.php
index 1c35f65580..43bb2b8e0b 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1389,13 +1389,8 @@ class programModel extends model
             /* The budget of a child project cannot beyond the remaining budget of the parent program. */
             if(isset($project->budget) and $parentProgram->budget != 0)
             {
-                $childGrade     = $parentProgram->grade + 1;
-                $childSumBudget = $this->dao->select("sum(budget) as sumBudget")->from(TABLE_PROJECT)
-                    ->where('path')->like("%{$project->parent}%")
-                    ->andWhere('grade')->eq($childGrade)
-                    ->fetch('sumBudget');
-
-                if($project->budget > $parentProgram->budget - $childSumBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
+                $parentRemainBudget = $this->getParentRemainBudget($parentProgram);
+                if($project->budget > $parentRemainBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
 
             /* Judge products not empty. */
@@ -1573,14 +1568,8 @@ class programModel extends model
             /* The budget of a child project cannot beyond the remaining budget of the parent program. */
             if($project->budget != 0 and $parentProgram->budget != 0)
             {
-                $childGrade     = $parentProgram->grade + 1;
-                $childSumBudget = $this->dao->select("sum(budget) as sumBudget")->from(TABLE_PROJECT)
-                    ->where('path')->like("%{$project->parent}%")
-                    ->andWhere('grade')->eq($childGrade)
-                    ->andWhere('id')->ne($projectID)
-                    ->fetch('sumBudget');
-
-                if($project->budget > $parentProgram->budget - $childSumBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
+                $parentRemainBudget = $this->getParentRemainBudget($parentProgram);
+                if($project->budget > $parentRemainBudget + $project->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
         }
 
diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php
index ec61909b52..f113fc616d 100644
--- a/module/program/view/pgmcreate.html.php
+++ b/module/program/view/pgmcreate.html.php
@@ -66,7 +66,7 @@
           <th><?php echo $lang->program->PGMBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php $placeholder = $parentProgram and $parentProgram->budget != 0 ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
+              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
               <?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
               <?php if($parentProgram):?>
               <span class='input-group-addon fix-border'><?php echo zget($budgetUnitList, $parentProgram->budgetUnit);?></span>
diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php
index 915dc13a86..0dfee337fc 100644
--- a/module/program/view/pgmedit.html.php
+++ b/module/program/view/pgmedit.html.php
@@ -44,7 +44,7 @@
           <th><?php echo $lang->program->PGMBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php $placeholder = $parentProgram and $parentProgram->budget != 0 ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
+              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
               <?php echo html::input('budget', $program->budget != 0 ? $program->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($program->budget == 0 ? 'disabled ' : '') . $placeholder);?>
               <?php if($parentProgram):?>
               <span class='input-group-addon'><?php echo zget($budgetUnitList, $program->budgetUnit);?></span>
diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php
index e4ae72680c..4f00282792 100644
--- a/module/program/view/prjcreate.html.php
+++ b/module/program/view/prjcreate.html.php
@@ -51,9 +51,14 @@
           <th><?php echo $lang->program->PRJBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
+              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
+              <?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . $placeholder);?>
+              <?php if($parentProgram):?>
+              <span class='input-group-addon'><?php echo zget($budgetUnitList, $parentProgram->budgetUnit);?></span>
+              <?php else:?>
               <span class='input-group-addon'></span>
-              <?php echo html::select('budgetUnit', $lang->program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?>
+              <?php echo html::select('budgetUnit', $budgetUnitList, $config->program->mainCurrency, "class='form-control'");?>
+              <?php endif;?>
             </div>
           </td>
           <td>
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php
index 1d0416da0c..9b88da6aaf 100644
--- a/module/program/view/prjedit.html.php
+++ b/module/program/view/prjedit.html.php
@@ -53,9 +53,14 @@
           <th><?php echo $lang->program->PRJBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? ' required' : '') . ($project->budget == 0 ? 'disabled' : ''));?>
+              <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . $remainBudget : '';?>
+              <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($project->budget == 0 ? 'disabled ' : '') . $placeholder);?>
+              <?php if($parentProgram):?>
+              <span class='input-group-addon'><?php echo zget($budgetUnitList, $project->budgetUnit);?></span>
+              <?php else:?>
               <span class='input-group-addon'></span>
-              <?php echo html::select('budgetUnit', $lang->program->unitList, $project->budgetUnit, "class='form-control'");?>
+              <?php echo html::select('budgetUnit', $budgetUnitList, $project->budgetUnit, "class='form-control'");?>
+              <?php endif;?>
             </div>
           </td>
           <td>

From 44f7c956390535496fe8caa4947a188c0b7f8de1 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 18 Jan 2021 14:21:52 +0800
Subject: [PATCH 5/9] * Fix a bug for story view page.

---
 module/product/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/product/control.php b/module/product/control.php
index 1f2fdbaa6b..73e31fa5ff 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -206,7 +206,7 @@ class product extends control
         }
 
         /* Process the sql, get the conditon partion, save it to session. */
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch' && $this->app->rawModule != 'projectstory');
 
         /* Get related tasks, bugs, cases count of each story. */
         $storyIdList = array();

From 7a5e58e606a7815409814c6d31fde7458fd8cd5e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 18 Jan 2021 14:24:51 +0800
Subject: [PATCH 6/9] * Add required.

---
 module/group/view/edit.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index b0c39a8456..5cbc4f83a7 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -23,7 +23,7 @@
     <table align='center' class='table table-form'> 
       <tr>
         <th><?php echo $lang->group->name;?></th>
-        <td><?php echo html::input('name', $group->name, "class='form-control'");?></td>
+        <td class='required'><?php echo html::input('name', $group->name, "class='form-control'");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->group->desc;?></th>

From 8d77e71634ac6c952d48d0ca091b4b662525aa36 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 18 Jan 2021 14:39:16 +0800
Subject: [PATCH 7/9] * Finish task #8957.

---
 module/custom/control.php       |  1 +
 module/custom/js/set.js         | 22 ++++++++++++++++++++++
 module/custom/lang/de.php       |  7 ++++---
 module/custom/lang/en.php       |  7 ++++---
 module/custom/lang/fr.php       |  7 ++++---
 module/custom/lang/vi.php       |  7 ++++---
 module/custom/lang/zh-cn.php    |  7 ++++---
 module/custom/lang/zh-tw.php    |  7 ++++---
 module/custom/view/set.html.php |  6 ++----
 9 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index 3161e5d2d2..2014491aab 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -94,6 +94,7 @@ class custom extends control
             {
                 $data = fixer::input('post')->join('unitList', ',')->get();
                 if(empty($data->unitList)) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->currencyNotEmpty));
+                if(empty($data->mainCurrency)) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->mainCurrencyNotEmpty));
                 $this->loadModel('setting')->setItems("system.$module", $data);
             }
             elseif($module == 'story' and $field == 'review')
diff --git a/module/custom/js/set.js b/module/custom/js/set.js
index 07c2c22a12..29772b3968 100644
--- a/module/custom/js/set.js
+++ b/module/custom/js/set.js
@@ -13,3 +13,25 @@ $(function()
     $('#' + module + 'Tab').addClass('btn-active-text');
     $('#' + field + 'Tab').addClass('active');
 })
+
+$('[name*=unitList]').change(function()
+{
+    var mainCurrency = $('#mainCurrency').val();
+    $('#mainCurrency').empty().append('<option></option>');
+    $('[name*=unitList]').each(function()
+    {
+        if($(this).prop('checked'))
+        {
+            var text     = $(this).parent().html();
+            var firstStr = $(this).val() + '">';
+
+            text = text.substring(text.lastIndexOf(firstStr) + firstStr.length, text.lastIndexOf('<'));
+            $('#mainCurrency').append("<option value='" + $(this).val() + "'>" + text + '</option>');
+                                                                                }
+    });
+
+     $('#mainCurrency').val(mainCurrency);
+     $("#mainCurrency").trigger("chosen:updated");
+});
+
+$('[name*=unitList]').change();
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 3b3c536f8a..15f2910b13 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -67,9 +67,10 @@ $lang->custom->tipCostList['CV']  = 'Cost Variance(CV%)';
 $lang->custom->tipRangeList[0]  = 'No';
 $lang->custom->tipRangeList[1]  = 'Yes';
 
-$lang->custom->regionMustNumber = 'The interval must be a number!';
-$lang->custom->tipNotEmpty      = 'The prompt can not be empty!';
-$lang->custom->currencyNotEmpty = 'You have to select one currency at least.';
+$lang->custom->regionMustNumber     = 'The interval must be a number!';
+$lang->custom->tipNotEmpty          = 'The prompt can not be empty!';
+$lang->custom->currencyNotEmpty     = 'You have to select one currency at least.';
+$lang->custom->mainCurrencyNotEmpty = 'The main currency can not bu empty';
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index e0803f82fd..f88bbfaf6f 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -67,9 +67,10 @@ $lang->custom->tipCostList['CV']  = 'Cost Variance(CV%)';
 $lang->custom->tipRangeList[0]  = 'No';
 $lang->custom->tipRangeList[1]  = 'Yes';
 
-$lang->custom->regionMustNumber = 'The interval must be a number!';
-$lang->custom->tipNotEmpty      = 'The prompt can not be empty!';
-$lang->custom->currencyNotEmpty = 'You have to select one currency at least.';
+$lang->custom->regionMustNumber     = 'The interval must be a number!';
+$lang->custom->tipNotEmpty          = 'The prompt can not be empty!';
+$lang->custom->currencyNotEmpty     = 'You have to select one currency at least.';
+$lang->custom->mainCurrencyNotEmpty = 'The main currency can not bu empty';
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 3ed4a4ca13..1836208efa 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -67,9 +67,10 @@ $lang->custom->tipCostList['CV']  = 'Cost Variance(CV%)';
 $lang->custom->tipRangeList[0]  = 'No';
 $lang->custom->tipRangeList[1]  = 'Yes';
 
-$lang->custom->regionMustNumber = 'The interval must be a number!';
-$lang->custom->tipNotEmpty      = 'The prompt can not be empty!';
-$lang->custom->currencyNotEmpty = 'You have to select one currency at least.';
+$lang->custom->regionMustNumber     = 'The interval must be a number!';
+$lang->custom->tipNotEmpty          = 'The prompt can not be empty!';
+$lang->custom->currencyNotEmpty     = 'You have to select one currency at least.';
+$lang->custom->mainCurrencyNotEmpty = 'The main currency can not bu empty';
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php
index 80bd937ed3..ca2426f9fe 100644
--- a/module/custom/lang/vi.php
+++ b/module/custom/lang/vi.php
@@ -67,9 +67,10 @@ $lang->custom->tipCostList['CV']  = 'Cost Variance(CV%)';
 $lang->custom->tipRangeList[0]  = 'No';
 $lang->custom->tipRangeList[1]  = 'Yes';
 
-$lang->custom->regionMustNumber = 'The interval must be a number!';
-$lang->custom->tipNotEmpty      = 'The prompt can not be empty!';
-$lang->custom->currencyNotEmpty = 'You have to select one currency at least.';
+$lang->custom->regionMustNumber     = 'The interval must be a number!';
+$lang->custom->tipNotEmpty          = 'The prompt can not be empty!';
+$lang->custom->currencyNotEmpty     = 'You have to select one currency at least.';
+$lang->custom->mainCurrencyNotEmpty = 'The main currency can not bu empty';
 
 $lang->custom->numberError = 'The interval must be greater than zero!';
 
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 051296dc9c..fd3533323d 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -67,9 +67,10 @@ $lang->custom->tipCostList['CV']  = '成本偏差率(CV%)';
 $lang->custom->tipRangeList[0]  = '否';
 $lang->custom->tipRangeList[1]  = '是';
 
-$lang->custom->regionMustNumber = '区间必须是数字';
-$lang->custom->tipNotEmpty      = '提示语不能为空';
-$lang->custom->currencyNotEmpty = '至少选择一种货币';
+$lang->custom->regionMustNumber     = '区间必须是数字';
+$lang->custom->tipNotEmpty          = '提示语不能为空';
+$lang->custom->currencyNotEmpty     = '至少选择一种货币';
+$lang->custom->mainCurrencyNotEmpty = '主要货币不能为空';
 
 $lang->custom->numberError = '区间必须大于零';
 
diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 50f3dea456..2f7d281ffd 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -64,9 +64,10 @@ $lang->custom->tipCostList['CV']  = '成本偏差率(CV%)';
 $lang->custom->tipRangeList[0]  = '否';
 $lang->custom->tipRangeList[1]  = '是';
 
-$lang->custom->regionMustNumber = '區間必須是數字';
-$lang->custom->tipNotEmpty      = '提示語不能為空';
-$lang->custom->currencyNotEmpty = '至少選擇一種貨幣';
+$lang->custom->regionMustNumber     = '區間必須是數字';
+$lang->custom->tipNotEmpty          = '提示語不能為空';
+$lang->custom->currencyNotEmpty     = '至少選擇一種貨幣';
+$lang->custom->mainCurrencyNotEmpty = '主要貨幣不能為空';
 
 $lang->custom->numberError = '區間必須大於零';
 
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index ca93102386..5b439cdf05 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -57,16 +57,14 @@ EOT;
       <?php if($module == 'program' and $field == 'unitList'):?>
       <table class='table table-form'>
         <tr>
-          <th class='text-left'><?php echo $lang->custom->program->currencySetting;?></th>
+          <th class='<?php echo strpos($this->app->getClientLang(), 'zh') === false ? 'w-120px' : 'w-70px';?> text-left'><?php echo $lang->custom->program->currencySetting;?></th>
         </tr>
         <tr>
-          <td colspan='4'><?php echo html::checkbox('unitList', $lang->program->unitList, $unitList);?></td>
+          <td colspan='5'><?php echo html::checkbox('unitList', $lang->program->unitList, $unitList);?></td>
         </tr>
         <tr>
           <th class='text-left'><?php echo $lang->custom->program->mainCurrency;?></th>
           <td><?php echo html::select('mainCurrency', $lang->program->unitList, $mainCurrency, "class='form-control chosen' required");?></td>
-          <td></td>
-          <td></td>
         </tr>
         <tr>
           <td colspan='4' class='text-center'><?php echo html::submitButton();?></td>

From 9c8fb2c131a60558f7b05dd9963fcdc00d98a53b Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 18 Jan 2021 14:58:41 +0800
Subject: [PATCH 8/9] * Finish task#8963.#8962. Fix bug.

---
 module/program/control.php | 4 ++--
 module/program/model.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index b98d158cdf..8e14781b47 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -213,7 +213,7 @@ class program extends control
         $this->view->PGMList        = $this->program->getPGMList();
         $this->view->budgetUnitList = $this->program->getBudgetUnitList();
         $this->view->parentProgram  = $parentProgram;
-        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram);
+        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram) + $program->budget;
 
         $this->display();
     }
@@ -994,7 +994,7 @@ class program extends control
         $this->view->URSRPairs      = $this->loadModel('custom')->getURSRPairs();
         $this->view->from           = $from;
         $this->view->parentProgram  = $parentProgram;
-        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram);
+        $this->view->remainBudget   = $this->program->getParentRemainBudget($parentProgram) + $project->budget;
         $this->view->budgetUnitList = $this->program->getBudgetUnitList();
 
         $this->display();
diff --git a/module/program/model.php b/module/program/model.php
index 43bb2b8e0b..e7bfe437ed 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -293,7 +293,7 @@ class programModel extends model
             if($program->budget != 0 and $parentProgram->budget != 0)
             {
                 $parentRemainBudget = $this->getParentRemainBudget($parentProgram);
-                if($program->budget > $parentRemainBudget + $program->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
+                if($program->budget > $parentRemainBudget + $oldProgram->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
         }
         if(dao::isError()) return false;
@@ -1569,7 +1569,7 @@ class programModel extends model
             if($project->budget != 0 and $parentProgram->budget != 0)
             {
                 $parentRemainBudget = $this->getParentRemainBudget($parentProgram);
-                if($project->budget > $parentRemainBudget + $project->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
+                if($project->budget > $parentRemainBudget + $oldProject->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
             }
         }
 

From 50c8836b971cefc5413cd790bd9132fa6238fd0d Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 18 Jan 2021 15:05:54 +0800
Subject: [PATCH 9/9] * add $.tabs.getLastTab method to index.

---
 module/index/js/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/index/js/index.js b/module/index/js/index.js
index 7dd0bb0245..b0fc82d9f0 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -361,6 +361,7 @@
         reload:     reloadTab,
         updateUrl:  updateTabUrl,
         getGroup:   getGroupFromUrl,
+        getLastTab: getLastTab,
         openedTabs: openedTabs,
         groupsMap:  groupsMap
     };