Merge branch 'bugfix/32640_liumengyi' into 'master'

* Fix bug #32640, #32618, #32465.

See merge request easycorp/zentaopms!7197

module/execution/control.php

@@ -2177,6 +2177,7 @@ class execution extends control
             $allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0);
             $this->project->setMenu($projectID);
             $this->view->project = $project;
+            if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->lang->execution->common = $this->lang->execution->stage;
         }
         else
         {

module/execution/model.php

@@ -390,11 +390,11 @@ class executionModel extends model
         $type    = 'sprint';
         if($project) $type = zget($this->config->execution->modelList, $project->model, 'sprint');
 
-        if(($project->model == 'waterfall' or $project->model == 'waterfallplus') and isset($this->config->setPercent) and $this->config->setPercent == 1)
+        if($project->model == 'waterfall' or $project->model == 'waterfallplus')
         {
             $_POST['products'] = array_filter($_POST['products']);
             if(empty($_POST['products'])) dao::$errors['products0'] = $this->lang->project->errorNoProducts;
-            $this->checkWorkload('create', $_POST['percent'], $project);
+            if(isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('create', $_POST['percent'], $project);
             if(dao::isError()) return false;
         }
 

module/programplan/css/create.css

@@ -1,3 +1,4 @@
 #planForm tr td {vertical-align: top;}
 #mainContent .methodTitle, #mainContent .methodTip {display: inline-block; vertical-align: middle;}
 .type-list-radio {display: inline-block; padding: 10px 5px;}
+#planForm .c-attribute {width: 110px;}