From 19fe5417dea64a5be00b74c0ece519912dc27fd2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 15 Mar 2023 06:34:32 +0000
Subject: [PATCH 1/3] * Fix bug #32640.

---
 module/programplan/css/create.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/programplan/css/create.css b/module/programplan/css/create.css
index 3cbcc213e0..c43afc7a47 100644
--- a/module/programplan/css/create.css
+++ b/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;}

From 6fc0fd186712eece1ad6d22235516748ce617904 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 15 Mar 2023 06:59:37 +0000
Subject: [PATCH 2/3] * Fix bug #32618.

---
 module/execution/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index b27463f5d3..3c3ee37b8d 100755
--- a/module/execution/model.php
+++ b/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;
         }
 

From ee56283107bd7d1a140f6088f365546c5b625a8f Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 15 Mar 2023 07:17:32 +0000
Subject: [PATCH 3/3] * Fix bug #32465.

---
 module/execution/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index a08edbe0f2..b693088674 100644
--- a/module/execution/control.php
+++ b/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
         {