From 2df27f17e9072134d0800c418dbe32011a51f9a2 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 1 Feb 2021 10:32:19 +0800
Subject: [PATCH 1/5] * Fix bug #3849.

---
 module/subject/view/browse.html.php | 3 +--
 module/todo/lang/zh-cn.php          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/subject/view/browse.html.php b/module/subject/view/browse.html.php
index 8555d4d318..6138fc9c68 100644
--- a/module/subject/view/browse.html.php
+++ b/module/subject/view/browse.html.php
@@ -78,9 +78,8 @@
             </tr>
             <tr>
               <td></td>
-              <td colspan="2" class="form-actions">
+              <td colspan="2" class="form-actions text-center">
                 <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
               </td>
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 5b1dde41ac..e5fde201a7 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -96,7 +96,7 @@ $lang->todo->typeList['custom']   = '自定义';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = '任务';
-$lang->todo->typeList['story']    = '软需';
+$lang->todo->typeList['story']    = $lang->SRCommon;
 $lang->todo->typeList['issue']    = '问题';
 $lang->todo->typeList['risk']     = '风险';
 $lang->todo->typeList['review']   = '评审';

From b1aa6c4d3ef8937c8d27aa7e05f2fbbcbdc5447e Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Mon, 1 Feb 2021 10:47:09 +0800
Subject: [PATCH 2/5] * Fix methodName.

---
 module/common/model.php          | 2 +-
 module/index/view/index.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index cb4ced4c22..9ea9af4dcc 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -614,7 +614,7 @@ class commonModel extends model
      * @access public
      * @return void
      */
-    public static function printRecentMemu()
+    public static function printRecentMenu()
     {
         global $lang;
         echo "<li class='divider'></li>";
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index 35f4594eea..ce0c40dc77 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -27,7 +27,7 @@ js::set('defaultOpen', $open);
     <ul class='nav nav-default' id='menuMainNav'>
     </ul>
     <ul class='nav nav-default'>
-      <?php commonModel::printRecentMemu();?>
+      <?php commonModel::printRecentMenu();?>
     </ul>
   </nav>
   <div class="table-col col-right">

From d2df19e920400591bff9a24e811ec9fb85865131 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 1 Feb 2021 10:57:30 +0800
Subject: [PATCH 3/5] * Modify language prompt.

---
 module/doc/view/side.html.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index da44b756df..45b9de7fb3 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -32,8 +32,15 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
             <?php if(empty($sideLibs[$tabValue])):?>
             <li>
             <?php
-            $text = zget($lang->doclib->create, $tabValue, '');
-            if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'");
+            if($lang->navGroup->doc == 'project' and $tabValue == 'project')
+            {
+                echo $lang->noData;
+            }
+            else
+            {
+                $text = zget($lang->doclib->create, $tabValue, '');
+                if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'");
+            }
             ?>
             </li>
             <?php else:?>

From a8a7cd6d7d424870913ecc93984900287cebe889 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 1 Feb 2021 11:02:46 +0800
Subject: [PATCH 4/5] * Fix bug.

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

diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 45b9de7fb3..1b6b719e53 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -32,7 +32,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
             <?php if(empty($sideLibs[$tabValue])):?>
             <li>
             <?php
-            if($lang->navGroup->doc == 'project' and $tabValue == 'project')
+            if($lang->navGroup->doc == 'doc' and $tabValue == 'project')
             {
                 echo $lang->noData;
             }

From 0ca1b70e01cba33658250120d15ffa6cb596cd77 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 1 Feb 2021 11:16:06 +0800
Subject: [PATCH 5/5] * Fix bug #3853.

---
 module/program/model.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/program/model.php b/module/program/model.php
index bd98e12390..0ad49c77ff 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1745,6 +1745,11 @@ class programModel extends model
                 }
                 $title = "title='{$PRJProgram}'";
             }
+            if($id == 'PRJBudget')
+            {
+                $budget = $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
+                $title  = "title='$budget'";
+            }
 
             if($id == 'PRJEstimate') $title = "title='{$project->hours->totalEstimate} {$this->lang->project->workHour}'";
             if($id == 'PRJConsume')  $title = "title='{$project->hours->totalConsumed} {$this->lang->project->workHour}'";
@@ -1781,7 +1786,7 @@ class programModel extends model
                     echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->program->statusList, $project->status) . "</span>";
                     break;
                 case 'PRJBudget':
-                    echo $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
+                    echo $budget;
                     break;
                 case 'teamCount':
                     echo $project->teamCount;