Merge branch '18.4' of git.zcorp.cc:easycorp/zentaopms into 18.4

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'))
     {

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')