From 91f6779ef7fc96e5e6cd135dc59ea3a4b49e082c Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Nov 2023 00:55:11 -0500
Subject: [PATCH] * Merge #f3cafbbed9,Finish task #93378.

---
 module/execution/ui/edit.html.php   | 6 +++---
 module/execution/view/edit.html.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/ui/edit.html.php b/module/execution/ui/edit.html.php
index d1bdbcd2de..30e6a3c38b 100644
--- a/module/execution/ui/edit.html.php
+++ b/module/execution/ui/edit.html.php
@@ -68,9 +68,9 @@ if(isset($project))
 }
 
 $typeBox = null;
-if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')))
+if(in_array($project->model, array('waterfall', 'waterfallplus')))
 {
-    $typeList = $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList;
+    $typeList = $lang->stage->typeList;
     $typeBox  = formRow
         (
             formGroup
@@ -102,7 +102,7 @@ if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')))
             )
         );
 }
-elseif($execution->type != 'kanban')
+elseif($execution->type != 'kanban' and $project->model != 'ipd')
 {
     $typeBox = formRow
         (
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 1f035fcede..ce3764a723 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -87,7 +87,7 @@
             </div>
           </td>
         </tr>
-        <?php if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))):?>
+        <?php if(in_array($project->model, array('waterfall', 'waterfallplus'))):?>
         <tr>
           <th><?php echo $lang->stage->type;?></th>
           <td>
@@ -97,7 +97,7 @@
             <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
           </td>
         </tr>
-        <?php elseif($execution->type != 'kanban'):?>
+        <?php elseif($execution->type != 'kanban' and $project->model != 'ipd'):?>
         <tr>
           <th><?php echo $lang->execution->type;?></th>
           <td>