* Finish task #92304.

module/execution/control.php

@@ -2099,7 +2099,7 @@ class execution extends control
         $project = $this->project->getById($execution->project);
         if(!$project->hasProduct) $this->lang->execution->PO = $this->lang->common->story . $this->lang->execution->owner;
 
-        if($project->model == 'waterfall' or $project->model == 'waterfallplus')
+        if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')))
         {
             $parentStage = $this->project->getByID($execution->parent, 'stage');
 

module/execution/view/edit.html.php

@@ -87,11 +87,11 @@
             </div>
           </td>
         </tr>
-        <?php if($project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
+        <?php if(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))):?>
         <tr>
           <th><?php echo $lang->stage->type;?></th>
           <td>
-          <?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute); ?>
+          <?php echo $enableOptionalAttr ? html::select('attribute', $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute); ?>
           </td>
           <td>
             <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>

module/product/control.php

@@ -211,7 +211,7 @@ class product extends control
         {
             setcookie('treeBranch', $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $browseType = 'unclosed';
-            if($this->config->vision == 'ipd') $browseType = 'assignedtome';
+            if($this->config->vision == 'or') $browseType = 'assignedtome';
         }
         else
         {

module/programplan/control.php

@@ -278,6 +278,7 @@ class programplan extends control
         $this->view->position[]         = $this->lang->programplan->edit;
         $this->view->isCreateTask       = $this->programplan->isCreateTask($planID);
         $this->view->plan               = $plan;
+        $this->view->project            = $this->project->getByID($plan->project);
         $this->view->parentStageList    = $this->programplan->getParentStageList($this->session->project, $planID, $plan->product);
         $this->view->enableOptionalAttr = (empty($parentStage) or (!empty($parentStage) and $parentStage->attribute == 'mix'));
         $this->view->isTopStage         = $this->programplan->checkTopStage($planID);

module/programplan/view/edit.html.php

@@ -60,10 +60,12 @@
           <tr id="attributeType">
             <th><?php echo $lang->programplan->attribute;?></th>
             <td colspan='2'>
-              <?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?>
+              <?php echo $enableOptionalAttr ? html::select('attribute', $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?>
             </td>
             <td>
+              <?php if($project->model != 'ipd'):?>
               <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>
+              <?php endif;?>
             </td>
           </tr>
           <?php if($plan->setMilestone):?>

module/project/config.php

@@ -144,6 +144,7 @@ $config->project->checkList->waterfall     = array('execution', 'design', 'doc',
 $config->project->checkList->kanban        = array('execution', 'build');
 $config->project->checkList->agileplus     = $config->project->checkList->scrum;
 $config->project->checkList->waterfallplus = $config->project->checkList->waterfall;
+$config->project->checkList->ipd           = $config->project->checkList->waterfall;
 
 $config->project->maxCheckList = new stdclass();
 $config->project->maxCheckList->scrum         = array('bug', 'execution', 'build', 'doc', 'release', 'testtask', 'case', 'issue', 'risk', 'meeting');
@@ -151,6 +152,7 @@ $config->project->maxCheckList->waterfall     = array('execution', 'design', 'do
 $config->project->maxCheckList->kanban        = array('execution', 'build');
 $config->project->maxCheckList->agileplus     = $config->project->maxCheckList->scrum;
 $config->project->maxCheckList->waterfallplus = $config->project->maxCheckList->waterfall;
+$config->project->maxCheckList->ipd           = $config->project->maxCheckList->waterfall;
 
 $config->project->search['module']                   = 'project';
 $config->project->search['fields']['name']           = $lang->project->name;

module/project/view/createguide.html.php

@@ -81,11 +81,6 @@
             <p><?php echo $lang->project->waterfallplusTitle;?></p>
           </div>
         </div>
-        <div class='col col-xs-4'>
-          <div class='project-type text-center'>
-            <div class='project-type-img more-type'><span class='text-muted'><?php echo $lang->project->moreModelTitle;?></span></div>
-          </div>
-        </div>
         <?php endif;?>
       </div>
     </div>