From d48556b15a12402e6ec11ac2923df511a378eef6 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 26 Apr 2023 15:40:16 +0800
Subject: [PATCH 1/2] * Fix bug #34864.

---
 module/group/lang/resource.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 74b993b13b..d31c4ed702 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -2111,6 +2111,7 @@ if(!$inUpgrade)
     {
         unset($lang->resource->program);
         unset($lang->resource->project->programTitle);
+        unset($lang->resource->product->manageLine);
     }
     if(!helper::hasFeature('waterfall') and !helper::hasFeature('waterfallplus'))
     {

From d7b5a066b472f032517158779dca3624c8c23e4c Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 26 Apr 2023 16:04:53 +0800
Subject: [PATCH 2/2] * Fix bug #34847.

---
 module/story/control.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 97da97dcee..401f01a474 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -511,7 +511,11 @@ class story extends control
         $this->view->hiddenProduct = false;
         $this->view->hiddenPlan    = false;
         /* Set menu. */
-        if($executionID)
+        if($this->app->tab == 'project' and $this->config->vision == 'lite')
+        {
+            $this->project->setMenu($this->session->project);
+        }
+        elseif($executionID)
         {
             $execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
             if($execution->type == 'project')