From 7170af3b44bf1dccb03cfcdb4beb16e4badb648e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 00:52:32 +0000
Subject: [PATCH 01/13] * Finish task #84586.

---
 module/execution/control.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 0264d93147..f7421d9998 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -4071,22 +4071,7 @@ class execution extends control
                 unset($fields[$key]);
             }
 
-            $executionStats = $this->execution->getStatData($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, false, '', 'id_asc');
-            if(isset($project->model) and $project->model == 'waterfall')
-            {
-                $stageList = array();
-                foreach($executionStats as $stage)
-                {
-                    $stageList[] = $stage;
-                    foreach($stage->children as $child)
-                    {
-                        $child->name = $stage->name . '/' . $child->name;
-                        $stageList[] = $child;
-                    }
-                }
-
-                $executionStats = $stageList;
-            }
+            $executionStats = $this->execution->getStatData($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, false, 'hasParentName', 'order_asc');
 
             $users = $this->loadModel('user')->getPairs('noletter');
             foreach($executionStats as $i => $execution)
@@ -4097,6 +4082,7 @@ class execution extends control
                 $execution->totalConsumed = $execution->hours->totalConsumed;
                 $execution->totalLeft     = $execution->hours->totalLeft;
                 $execution->progress      = $execution->hours->progress . '%';
+                $execution->name          = isset($execution->title) ? $execution->title : $execution->name;
                 if($this->app->tab == 'project' and ($project->model == 'agileplus' or $project->model == 'waterfallplus')) $execution->method = zget($executionLang->typeList, $execution->type);
 
                 if($this->post->exportType == 'selected')

From 2ebf416299269a8288d360b95cd78f57ab0cb5ab Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 00:52:54 +0000
Subject: [PATCH 02/13] * Fix bug of task #84584.

---
 module/programplan/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index d719335d9d..ded8e02027 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -140,7 +140,7 @@
             <?php $disabled = isset($plan->setMilestone) ? '' : "disabled='disabled'"?>
             <?php echo html::hidden("planIDList[$i]", $plan->id);?>
             <tr>
-              <td class='<?php echo $typeClass;?>'><?php echo html::select("type[$i]", $lang->execution->typeList, $plan->type, "class='form-control chosen'");?></td>
+              <td class='<?php echo $typeClass . ' text-center ' .zget($lang->execution->typeList, $plan->type);?>'><?php echo zget($lang->execution->typeList, $plan->type);?></td>
               <td><input type='text' name="names[<?php echo $i;?>]" id='names<?php echo $i;?>' value='<?php echo $plan->name;?>' class='form-control' /></td>
               <?php if(!isset($config->setCode) or $config->setCode == 1):?>
               <td><?php echo html::input("codes[$i]", $plan->code, "class='form-control'");?></td>

From 6a9b3fc6e44caf0abef747c9e419732bc9955ecc Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 06:26:19 +0000
Subject: [PATCH 03/13] * Fix bug #32243.

---
 module/execution/control.php          | 32 +++++++--------------------
 module/execution/view/create.html.php | 12 +++++++++-
 module/execution/view/edit.html.php   | 12 +++++++++-
 module/productplan/model.php          |  2 +-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 44d1973535..bfd262a97e 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1727,15 +1727,8 @@ class execution extends control
                     }
 
                     $importPlanStoryTips = $multiBranchProduct ? $this->lang->execution->importBranchPlanStory : $this->lang->execution->importPlanStory;
-                    if(!$execution->hasProduct)
-                    {
-                        return print(js::locate(inlink('create', "projectID=$projectID&executionID=$executionID")));
-                    }
-                    else
-                    {
-                        return print(js::confirm($importPlanStoryTips, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
 
-                    }
+                    return print(js::confirm($importPlanStoryTips, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
                 }
             }
 
@@ -1801,16 +1794,11 @@ class execution extends control
         {
             if(isset($_POST['attribute']) and in_array($_POST['attribute'], array('request', 'design', 'review'))) unset($_POST['plans']);
 
-            /* No product execution link plans. */
-            if(isset($project->hasProduct) and empty($project->hasProduct) and !empty($_POST['plans']))
+            /* Filter empty plans. */
+            if(!empty($_POST['plans']))
             {
-                $plansItem = array();
-                foreach($_POST['plans'] as $planItem)
-                {
-                    if(empty($planItem[0][0])) continue;
-                    $plansItem[] = $planItem[0][0];
-                }
-                $_POST['plans'] = array($_POST['products'][0] => array(0 => $plansItem));
+                foreach($_POST['plans'] as $key => $planItem) $_POST['plans'][$key] = array_filter($_POST['plans'][$key]);
+                $_POST['plans'] = array_filter($_POST['plans']);
             }
 
             $executionID = $this->execution->create($copyExecutionID);
@@ -2006,15 +1994,11 @@ class execution extends control
             $newPlans = array();
             if(isset($_POST['plans']))
             {
-
-                foreach($_POST['plans'] as $plans)
+                foreach($_POST['plans'] as $products)
                 {
-                    foreach($plans as $planList)
+                    foreach($products as $planID)
                     {
-                        foreach($planList as $planID)
-                        {
-                            if(array_search($planID, $oldPlans) === false) $newPlans[$planID] = $planID;
-                        }
+                        if(array_search($planID, $oldPlans) === false) $newPlans[$planID] = $planID;
                     }
                 }
             }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 472a35d630..f087cc8332 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -140,7 +140,7 @@
         <?php $this->printExtendFields('', 'table', 'columns=3');?>
         <?php $hidden = 'hide'?>
         <?php if(!empty($project->hasProduct)) $hidden = ''?>
-        <?php if($products):?>
+        <?php if(isset($project->hasProduct) and !empty($project->hasProduct) and $products):?>
         <?php $i = 0;?>
         <?php foreach($products as $product):?>
         <tr class="<?php echo $hidden;?>">
@@ -184,6 +184,16 @@
         </tr>
         <?php $i ++;?>
         <?php endforeach;?>
+        <?php elseif(!empty($project) and empty($project->hasProduct)):?>
+        <tr>
+          <th><?php echo $lang->execution->linkPlan;?></th>
+          <td id="plansBox">
+            <?php $planProductID = current(array_keys($allProducts));?>
+            <?php echo html::select("plans[$planProductID][]", isset($productPlan) ? $productPlan : array(), '', "class='form-control chosen' multiple");?>
+            <?php echo html::hidden("products[]", $planProductID);?>
+            <?php echo html::hidden("branch[0][0]", '0');?>
+          </td>
+        </tr>
         <?php else:?>
         <tr class='<?php echo $hidden;?>'>
           <th id='productTitle'><?php echo $lang->project->manageProductPlan;?></th>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 826cad20aa..299f88e233 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -151,7 +151,7 @@
         <?php if($project->model != 'waterfall' and $project->model != 'waterfallplus'): ?>
         <?php $hidden = 'hide'?>
         <?php if(!empty($project->hasProduct)) $hidden = ''?>
-        <?php if($linkedProducts):?>
+        <?php if(!empty($project) and !empty($project->hasProduct) and $linkedProducts):?>
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr class="<?php echo $hidden;?>">
@@ -195,6 +195,16 @@
         </tr>
         <?php $i ++;?>
         <?php endforeach;?>
+        <?php elseif(!empty($project) and empty($project->hasProduct)):?>
+        <tr>
+          <th><?php echo $lang->execution->linkPlan;?></th>
+          <td id="plansBox">
+            <?php $planProductID = current(array_keys($linkedProducts));?>
+            <?php echo html::select("plans[$planProductID][]", isset($productPlans[$planProductID]) ? $productPlans[$planProductID] : array(), isset($linkedProducts[$planProductID]) ? $linkedProducts[$planProductID]->plans : '', "class='form-control chosen' multiple");?>
+            <?php echo html::hidden("products[]", $planProductID);?>
+            <?php echo html::hidden("branch[0][0]", '0');?>
+          </td>
+        </tr>
         <?php else:?>
         <tr class='<?php echo $hidden;?>'>
           <th id='productTitle'><?php echo $lang->project->manageProductPlan;?></th>
diff --git a/module/productplan/model.php b/module/productplan/model.php
index af09f76d85..2c31845d58 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -1109,7 +1109,7 @@ class productplanModel extends model
                 foreach($planStory as $id => $story)
                 {
                     $projectBranches = zget($projectProducts, $story->product, array());
-                    if($story->status == 'active' or (!empty($story->branch) and !empty($projectBranches) and !isset($projectBranches[$story->branch])))
+                    if($story->status != 'active' or (!empty($story->branch) and !empty($projectBranches) and !isset($projectBranches[$story->branch])))
                     {
                         unset($planStory[$id]);
                         continue;

From 1fb012e88906d31406f7b3e883e2bfc5ea3566b9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 06:28:43 +0000
Subject: [PATCH 04/13] * Optimize code of bug #32243.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index bfd262a97e..148f504a02 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1994,9 +1994,9 @@ class execution extends control
             $newPlans = array();
             if(isset($_POST['plans']))
             {
-                foreach($_POST['plans'] as $products)
+                foreach($_POST['plans'] as $plans)
                 {
-                    foreach($products as $planID)
+                    foreach($plans as $planID)
                     {
                         if(array_search($planID, $oldPlans) === false) $newPlans[$planID] = $planID;
                     }

From b1f57ce0daca5f979111179f45e41e1223d33ed2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 07:50:45 +0000
Subject: [PATCH 05/13] * Fix bug #32244, #32245.

---
 module/programplan/model.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 15d82b1d11..4c6043071c 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -749,7 +749,7 @@ class programplanModel extends model
         foreach($datas as $index => $plan)
         {
             if(!empty($sameNames) and in_array($plan->name, $sameNames)) dao::$errors[$index]['name'] = empty($type) ? $this->lang->programplan->error->sameName : str_replace($this->lang->execution->stage, '', $this->lang->programplan->error->sameName);
-            if($setCode and $sameCodes !== true and !empty($sameCodes) and in_array($plan->code, $sameCodes)) dao::$errors[$index]['code'] = sprintf($this->lang->error->repeat, $this->lang->execution->code, $plan->code);
+            if($setCode and $sameCodes !== true and !empty($sameCodes) and in_array($plan->code, $sameCodes)) dao::$errors[$index]['code'] = sprintf($this->lang->error->repeat, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code, $plan->code);
 
             if($plan->percent and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $plan->percent))
             {
@@ -778,7 +778,7 @@ class programplanModel extends model
             if(isset($parentStage) and ($plan->end > $parentStage->end || $plan->begin < $parentStage->begin))
             {
                 if($plan->begin < $parentStage->begin and empty(dao::$errors[$index]['begin'])) dao::$errors[$index]['begin'] = $this->lang->programplan->error->parentDuration;
-                if($plan->end < $parentStage->end and empty(dao::$errors[$index]['end']))      dao::$errors[$index]['end']   = $this->lang->programplan->error->parentDuration;
+                if($plan->end > $parentStage->end and empty(dao::$errors[$index]['end']))       dao::$errors[$index]['end']   = $this->lang->programplan->error->parentDuration;
             }
             if($plan->begin < $project->begin and empty(dao::$errors[$index]['begin']))
             {
@@ -793,7 +793,7 @@ class programplanModel extends model
             if(helper::isZeroDate($plan->end))   $plan->end   = '';
             if($setCode and empty($plan->code))
             {
-                dao::$errors[$index]['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
+                dao::$errors[$index]['code'] = sprintf($this->lang->error->notempty, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code);
             }
             foreach(explode(',', $this->config->programplan->create->requiredFields) as $field)
             {
@@ -1346,15 +1346,15 @@ class programplanModel extends model
     public function checkCodeUnique($codes, $planIDList)
     {
         $codes = array_filter($codes);
-        if(count(array_unique($codes)) != count($codes)) return false;
 
-        $code = $this->dao->select('code')->from(TABLE_EXECUTION)
+        $sameCodes = $this->dao->select('code')->from(TABLE_EXECUTION)
             ->where('type')->in('sprint,stage,kanban')
             ->andWhere('deleted')->eq('0')
             ->andWhere('code')->in($codes)
             ->beginIF($planIDList)->andWhere('id')->notin($planIDList)->fi()
             ->fetchPairs('code');
-        return $code ? $code : true;
+        if(count(array_unique($codes)) != count($codes)) $sameCodes += array_diff_assoc($codes, array_unique($codes));
+        return $sameCodes ? $sameCodes : true;
     }
 
     /**

From 61e824c5486cb98cd92bf061ceb48bf068e00f0a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 07:54:54 +0000
Subject: [PATCH 06/13] * Fix bug #32249.

---
 module/action/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/action/control.php b/module/action/control.php
index 92284c76e4..971a251e50 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -376,7 +376,7 @@ class action extends control
 
         /* Check type of siblings. */
         $siblings = $this->dao->select('DISTINCT type')->from(TABLE_EXECUTION)->where('deleted')->eq(0)->andWhere('parent')->eq($execution->parent)->fetchPairs('type');
-        if($execution->type == 'stage' and (isset($bsiblings['sprint']) or isset($siblings['kanban']))) die(js::alert($this->lang->action->hasOtherType[$execution->type]));
+        if($execution->type == 'stage' and (isset($siblings['sprint']) or isset($siblings['kanban']))) die(js::alert($this->lang->action->hasOtherType[$execution->type]));
         if(($execution->type == 'sprint' or $execution->type == 'kanban') and isset($siblings['stage'])) die(js::alert($this->lang->action->hasOtherType[$execution->type]));
 
         /* If parent stage is not exists, you should recover its parent stages, refresh status. */

From 02adc7454f73b8f7cab762d72880c082c7adcbab Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 07:27:40 +0000
Subject: [PATCH 07/13] * Fix bug #32251.

---
 module/programplan/lang/de.php    | 4 ++--
 module/programplan/lang/en.php    | 4 ++--
 module/programplan/lang/fr.php    | 4 ++--
 module/programplan/lang/zh-cn.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index e653b4534c..7b1a58d0cf 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -82,7 +82,7 @@ $lang->programplan->delayList[0] = 'No';
 
 $lang->programplan->typeList = array();
 $lang->programplan->typeList['stage']     = 'Stage';
-$lang->programplan->typeList['agileplus'] = 'Sprint/Kanban';
+$lang->programplan->typeList['agileplus'] = $lang->executionCommon . '/Kanban';
 
 $lang->programplan->noData            = 'No Data';
 $lang->programplan->children          = 'Sub Plan';
@@ -118,7 +118,7 @@ $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
 $lang->programplan->error->planDrag        = 'The %s stage cannot be dragged';
-$lang->programplan->error->notStage        = 'Sprint/Kanban cannot create a sub stage.';
+$lang->programplan->error->notStage        = $lang->executionCommon . '/Kanban cannot create a sub stage.';
 
 $lang->programplan->ganttBrowseType['gantt']       = 'Group by Stage';
 $lang->programplan->ganttBrowseType['assignedTo']  = 'Group by AssignedTo';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index 1846fa4c83..6d25da9d4c 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -82,7 +82,7 @@ $lang->programplan->delayList[0] = 'No';
 
 $lang->programplan->typeList = array();
 $lang->programplan->typeList['stage']     = 'Stage';
-$lang->programplan->typeList['agileplus'] = 'Sprint/Kanban';
+$lang->programplan->typeList['agileplus'] = $lang->executionCommon . '/Kanban';
 
 $lang->programplan->noData            = 'No Data';
 $lang->programplan->children          = 'Sub Plan';
@@ -118,7 +118,7 @@ $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
 $lang->programplan->error->planDrag        = 'The %s stage cannot be dragged';
-$lang->programplan->error->notStage        = 'Sprint/Kanban cannot create a sub stage.';
+$lang->programplan->error->notStage        = $lang->executionCommon . '/Kanban cannot create a sub stage.';
 
 $lang->programplan->ganttBrowseType['gantt']       = 'Group by Stage';
 $lang->programplan->ganttBrowseType['assignedTo']  = 'Group by AssignedTo';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index e653b4534c..7b1a58d0cf 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -82,7 +82,7 @@ $lang->programplan->delayList[0] = 'No';
 
 $lang->programplan->typeList = array();
 $lang->programplan->typeList['stage']     = 'Stage';
-$lang->programplan->typeList['agileplus'] = 'Sprint/Kanban';
+$lang->programplan->typeList['agileplus'] = $lang->executionCommon . '/Kanban';
 
 $lang->programplan->noData            = 'No Data';
 $lang->programplan->children          = 'Sub Plan';
@@ -118,7 +118,7 @@ $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
 $lang->programplan->error->planDrag        = 'The %s stage cannot be dragged';
-$lang->programplan->error->notStage        = 'Sprint/Kanban cannot create a sub stage.';
+$lang->programplan->error->notStage        = $lang->executionCommon . '/Kanban cannot create a sub stage.';
 
 $lang->programplan->ganttBrowseType['gantt']       = 'Group by Stage';
 $lang->programplan->ganttBrowseType['assignedTo']  = 'Group by AssignedTo';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 6bb4359a30..eb55d08810 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -82,7 +82,7 @@ $lang->programplan->delayList[0] = '否';
 
 $lang->programplan->typeList = array();
 $lang->programplan->typeList['stage']     = '阶段';
-$lang->programplan->typeList['agileplus'] = '迭代/看板';
+$lang->programplan->typeList['agileplus'] = $lang->executionCommon . '/看板';
 
 $lang->programplan->noData            = '暂无数据。';
 $lang->programplan->children          = '二级计划';
@@ -118,7 +118,7 @@ $lang->programplan->error->sameName        = '阶段名称不能相同！';
 $lang->programplan->error->sameCode        = '阶段代号不能相同！';
 $lang->programplan->error->taskDrag        = '%s的任务不可以拖动';
 $lang->programplan->error->planDrag        = '%s的阶段不可以拖动';
-$lang->programplan->error->notStage        = '迭代/看板不支持创建子阶段';
+$lang->programplan->error->notStage        = $lang->executionCommon . '/看板不支持创建子阶段';
 
 $lang->programplan->ganttBrowseType['gantt']       = '按阶段分组';
 $lang->programplan->ganttBrowseType['assignedTo']  = '按指派给分组';

From 1eb1f7ad7b58919bf42f7bc8121bf3191d3d432a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 07:28:22 +0000
Subject: [PATCH 08/13] * Fix bug of create waterfallplus's execution.

---
 module/execution/control.php          |  2 +-
 module/execution/js/common.js         |  2 +-
 module/execution/view/create.html.php | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 44d1973535..2e99560225 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1912,7 +1912,7 @@ class execution extends control
         $this->view->users               = $this->loadModel('user')->getPairs('nodeleted|noclosed');
         $this->view->copyExecution       = isset($copyExecution) ? $copyExecution : '';
         $this->view->from                = $this->app->tab;
-        $this->view->isStage             = (isset($project->model) and $project->model == 'waterfall') ? true : false;
+        $this->view->isStage             = (isset($project->model) and ($project->model == 'waterfall' or $project->model == 'waterfallplus')) ? true : false;
         $this->view->project             = $project;
         $this->view->division            = !empty($project) ? $project->division : 1;
         $this->view->type                = $type;
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 7a138fe055..37b32040ba 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -180,7 +180,7 @@ function loadBranches(product)
         var branch = $('#branch' + index);
         loadPlans(product, branch);
 
-        if(typeof isWaterfall != 'undefined' && isWaterfall == true)
+        if(typeof isStage != 'undefined' && isStage == true)
         {
             $tableRow.find("select[name^='branch'] option").attr('selected', 'selected');
             $tableRow.find("select[name^='branch']").trigger('chosen:updated');
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 472a35d630..9b94fb153b 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -31,7 +31,6 @@
 
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $isWaterfall = (!empty($project->model) and ($project->model == 'waterfall' or $project->model == 'waterfallplus')) ? true : false;?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::set('holders', $lang->execution->placeholder);?>
@@ -47,7 +46,6 @@
 <?php js::set('cancelCopy', $lang->execution->cancelCopy);?>
 <?php js::set('copyNoExecution', $lang->execution->copyNoExecution);?>
 <?php js::set('model', isset($project->model) ? $project->model : '');?>
-<?php js::set('isWaterfall', $isWaterfall);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -153,9 +151,9 @@
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span>
-                      <?php $disabled = ($isWaterfall and !$project->division) ? "disabled='disabled'" : '';?>
+                      <?php $disabled = ($isStage and !$project->division) ? "disabled='disabled'" : '';?>
                       <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
-                      <?php if($isWaterfall and !$project->division) echo html::hidden("products[$i]", $product->id);?>
+                      <?php if($isStage and !$project->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>
                   </div>
                   <div class='table-col <?php if(!$hasBranch) echo 'hidden'; if($disabled) echo ' disabledBranch'?>'>
@@ -171,7 +169,7 @@
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), isset($product->plans) ? $product->plans : '', "class='form-control chosen' multiple");?>
-                  <?php if(!($isWaterfall and !$project->division)):?>
+                  <?php if(!($isStage and !$project->division)):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>
@@ -209,7 +207,7 @@
                 <div class='input-group' id='plan0'>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[][]", $productPlan, '', "class='form-control chosen' multiple");?>
-                  <?php if(!($isWaterfall and $project->division)):?>
+                  <?php if(!($isStage and $project->division)):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' style='visibility: hidden'><i class='icon-close'></i></a>

From 0ad1aba2eeb694a98a329fc9c3815856372babf0 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 08:38:13 +0000
Subject: [PATCH 09/13] * Fix bug #32255.

---
 module/programplan/model.php | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 4c6043071c..e1789a1369 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -833,6 +833,22 @@ class programplanModel extends model
             }
         }
 
+        $linkProducts = array();
+        $linkBranches = array();
+        $productList  = $this->loadModel('product')->getProducts($projectID);
+        if($project->division)
+        {
+            $linkProducts = array(0 => $productID);
+            $linkBranches = array(0 => $productList[$productID]->branches);
+        }
+        else
+        {
+            $linkProducts = array_keys($productList);
+            foreach($linkProducts as $index => $productID) $linkBranches[$index] = $productList[$productID]->branches;
+        }
+        $this->post->set('products', $linkProducts);
+        $this->post->set('branch', $linkBranches);
+
         foreach($datas as $data)
         {
             /* Set planDuration and realDuration. */
@@ -846,6 +862,7 @@ class programplanModel extends model
             $data->days     = helper::diffDate($data->end, $data->begin) + 1;
             $data->order    = current($orders);
 
+
             if($data->id)
             {
                 $stageID = $data->id;
@@ -985,22 +1002,6 @@ class programplanModel extends model
                     $this->computeProgress($stageID, 'create');
                 }
             }
-
-            $linkProducts = array();
-            $linkBranches = array();
-            $productList  = $this->loadModel('product')->getProducts($projectID);
-            if($project->division)
-            {
-                $linkProducts = array(0 => $productID);
-                $linkBranches = array(0 => $productList[$productID]->branches);
-            }
-            else
-            {
-                $linkProducts = array_keys($productList);
-                foreach($linkProducts as $index => $productID) $linkBranches[$index] = $productList[$productID]->branches;
-            }
-            $this->post->set('products', $linkProducts);
-            $this->post->set('branch', $linkBranches);
             $this->execution->updateProducts($stageID);
 
             /* If child plans has milestone, update parent plan set milestone eq 0 . */

From c28161fb0d58f7f823b4c26e6363831086383dd9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 09:15:04 +0000
Subject: [PATCH 10/13] * Fix bug of create project.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 59b321bc28..69e732bcef 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1236,7 +1236,7 @@ class projectModel extends model
             ->setIF($this->post->delta == 999, 'days', 0)
             ->setIF($this->post->acl   == 'open', 'whitelist', '')
             ->setIF(!isset($_POST['whitelist']), 'whitelist', '')
-            ->setDefault('multiple', '1')
+            ->setIF(!isset($_POST['multiple']), 'multiple', '1')
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', helper::now())
             ->setDefault('team', $this->post->name)

From 09cb859c5e1cc8adef0660d784b0111fde79f3a7 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 09:30:25 +0000
Subject: [PATCH 11/13] * Fix bug #32179.

---
 module/action/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/action/model.php b/module/action/model.php
index 0dfdf4a832..30ddc77468 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -489,7 +489,7 @@ class actionModel extends model
             elseif($actionName == 'importedcard')
             {
                 $title = $this->dao->select('name')->from(TABLE_KANBAN)->where('id')->eq($action->extra)->fetch('name');
-                if($title) $action->extra = common::hasPriv('kanban', 'view') ? html::a(helper::createLink('kanban', 'view', "kanbanID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title;
+                if($title) $action->extra = (common::hasPriv('kanban', 'view') and !isonlybody()) ? html::a(helper::createLink('kanban', 'view', "kanbanID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title;
             }
             elseif($actionName == 'createchildren')
             {

From fb57e0f9949c955e5c2c9fab1f42341421e84d71 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Sat, 18 Feb 2023 09:42:58 +0000
Subject: [PATCH 12/13] * Fix bug #32167.

---
 module/story/js/edit.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/story/js/edit.js b/module/story/js/edit.js
index 2b8602a7b2..a5f7462886 100644
--- a/module/story/js/edit.js
+++ b/module/story/js/edit.js
@@ -95,4 +95,9 @@ $(function()
     {
         $('#planIdBox .chosen-container').find('div').css('width', $('#planIdBox').width())
     });
+
+    $('#parent_chosen').click(function()
+    {
+        $('#parent_chosen').find('div').css('width', $('#parent_chosen').width())
+    });
 })

From 06220e4f1f9c20325650d592d5271b8525bc07ee Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 20 Feb 2023 08:34:19 +0800
Subject: [PATCH 13/13] * Fix lower php version error.

---
 module/execution/view/story.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index be7a90e189..4c13d81f1c 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -411,7 +411,8 @@
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'");?>
-          <?php $disabled = empty(array_filter($allPlans)) ? 'disabled' : ''?>
+          <?php $allPlans = array_filter($allPlans);?>
+          <?php $disabled = empty($allPlans) ? 'disabled' : ''?>
           <span class='input-group-btn'><?php echo html::commonButton($lang->execution->linkStory, "id='toTaskButton'", 'btn btn-primary ' . $disabled);?></span>
         </div>
       </div>