diff --git a/module/execution/model.php b/module/execution/model.php index b3f64d6c25..019c60bac1 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2087,7 +2087,7 @@ class executionModel extends model ->fetchAll('id'); /* Add product name and parent stage name to stage name. */ - if(isset($project->model) and in_array($project->model, array('waterfall', 'waterfallplus'))) + if(isset($project->model) and in_array($project->model, array('waterfall', 'waterfallplus', 'research'))) { $executionProducts = array(); if($project->hasProduct and $project->division) diff --git a/module/programplan/model.php b/module/programplan/model.php index 9df3d770bf..fca63db956 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -843,6 +843,7 @@ class programplanModel extends model $plan->desc = empty($desc[$key]) ? '' : $desc[$key]; $plan->hasProduct = $project->hasProduct; $plan->vision = $this->config->vision; + $plan->market = $project->market; if(!empty($begin[$key])) $plan->begin = $begin[$key]; if(!empty($end[$key])) $plan->end = $end[$key];