diff --git a/module/programplan/config/form.php b/module/programplan/config/form.php
index 152f9e7125..f52a1827b1 100644
--- a/module/programplan/config/form.php
+++ b/module/programplan/config/form.php
@@ -43,11 +43,11 @@ $config->programplan->form->create['PM']         = array('label' => $lang->progr
 $config->programplan->form->create['percent']    = array('label' => $lang->programplan->percent,   'type' => 'array', 'control' => 'number',   'required' => false, 'default' => 0,      'options' => array());
 $config->programplan->form->create['attribute']  = array('label' => $lang->programplan->attribute, 'type' => 'array', 'control' => 'picker',   'required' => false, 'default' => 0,      'options' => $lang->stage->typeList);
 $config->programplan->form->create['acl']        = array('label' => $lang->programplan->acl,       'type' => 'array', 'control' => 'picker',   'required' => false, 'default' => 'open', 'options' => $lang->execution->aclList);
-$config->programplan->form->create['milestone']  = array('label' => $lang->programplan->milestone, 'type' => 'array', 'control' => 'radioList','required' => false, 'default' => 0,      'options' => $lang->programplan->milestoneList);
 $config->programplan->form->create['begin']      = array('label' => $lang->programplan->begin,     'type' => 'array', 'control' => 'date',     'required' => true,  'default' => '');
 $config->programplan->form->create['end']        = array('label' => $lang->programplan->end,       'type' => 'array', 'control' => 'date',     'required' => true,  'default' => '');
 $config->programplan->form->create['realBegan']  = array('label' => $lang->programplan->realBegan, 'type' => 'array', 'control' => 'date',     'required' => false, 'default' => '');
 $config->programplan->form->create['realEnd']    = array('label' => $lang->programplan->realEnd,   'type' => 'array', 'control' => 'date',     'required' => false, 'default' => '');
+$config->programplan->form->create['milestone']  = array('label' => $lang->programplan->milestone, 'type' => 'array', 'control' => 'radioList','required' => false, 'default' => 0,      'options' => $lang->programplan->milestoneList);
 $config->programplan->form->create['desc']       = array('label' => $lang->programplan->desc,      'type' => 'array', 'control' => 'textarea', 'required' => false, 'default' => '');
 
 $config->programplan->form->updateDateByGantt['id']        = array('required' => false, 'type' => 'int',    'default' => 0);
diff --git a/module/programplan/control.php b/module/programplan/control.php
index 4fd5e0b28a..7196cf267e 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -241,15 +241,18 @@ class programplan extends control
      *
      * @param  int    $stageID
      * @param  string $attribute
+     * @param  string $projectModel
      * @access public
      * @return int
      */
-    public function ajaxGetAttribute(int $stageID, string $attribute): int
+    public function ajaxGetAttribute(int $stageID, string $attribute, string $projectModel = ''): int
     {
         $this->app->loadLang('stage');
 
         $stageAttribute = $this->programplan->getStageAttribute($stageID);
 
+        if($projectModel == 'ipd') $this->lang->stage->typeList = $this->lang->stage->ipdTypeList;
+
         if(empty($stageAttribute) || $stageAttribute == 'mix')
         {
             return print(html::select('attribute', $this->lang->stage->typeList, $attribute, "class='form-control chosen'"));
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index fb328fd210..67343886b5 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -21,6 +21,7 @@ $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
 $lang->programplan->subPlanManage = 'Sub-stages management';
+$lang->programplan->submit        = 'Submit';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index d6aa3e3d71..c5a924de06 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -21,6 +21,7 @@ $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Stage';
 $lang->programplan->subPlanManage = 'Sub-stages management';
+$lang->programplan->submit        = 'Submit';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index fb328fd210..67343886b5 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -21,6 +21,7 @@ $lang->programplan->close         = 'Close Stage';
 $lang->programplan->activate      = 'Activate Stage';
 $lang->programplan->createSubPlan = 'Create Sub Plan';
 $lang->programplan->subPlanManage = 'Sub-stages management';
+$lang->programplan->submit        = 'Submit';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 912104f226..71291f5d37 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -21,6 +21,7 @@ $lang->programplan->close         = '关闭阶段';
 $lang->programplan->activate      = '激活阶段';
 $lang->programplan->createSubPlan = '创建子阶段';
 $lang->programplan->subPlanManage = '子阶段的管理方法';
+$lang->programplan->submit        = '提交评审';
 
 $lang->programplan->parent           = '父阶段';
 $lang->programplan->emptyParent      = '无';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 75f6e23345..acdf4213df 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -135,7 +135,7 @@ class programplanModel extends model
      * 获取甘特图页面数据。
      * Get gantt data.
      *
-     * @param  int     $executionID
+     * @param  int     $projectID
      * @param  int     $productID
      * @param  int     $baselineID
      * @param  string  $selectCustom
@@ -143,9 +143,9 @@ class programplanModel extends model
      * @access public
      * @return string|array
      */
-    public function getDataForGantt(int $executionID, int $productID, int $baselineID = 0, string $selectCustom = '', bool $returnJson = true): string|array
+    public function getDataForGantt(int $projectID, int $productID, int $baselineID = 0, string $selectCustom = '', bool $returnJson = true): string|array
     {
-        $plans = $this->getStage($executionID, $productID, 'all', 'order');
+        $plans = $this->getStage($projectID, $productID, 'all', 'order');
 
         /* Set plan baseline data. */
         if($baselineID)
@@ -177,6 +177,9 @@ class programplanModel extends model
         /* Set task for gantt view. */
         $this->programplanTao->setTask($tasks, $plans, $selectCustom, $datas, $stageIndex);
 
+        /* Build data for ipd. */
+        if($project->model == 'ipd' and $datas) $datas = $this->programplanTao->buildGanttData4IPD($datas, $projectID, $productID, $selectCustom, $reviewDeadline);
+
         /* Calculate the progress of the phase. */
         foreach($stageIndex as $index => $stage)
         {
@@ -698,7 +701,7 @@ class programplanModel extends model
                 $this->dao->update(TABLE_PROJECT)->data($plan)
                     ->autoCheck()
                     ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
-                    ->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
+                    ->checkIF(!empty($plan->percent) and $setPercent, 'percent', 'float')
                     ->where('id')->eq($stageID)
                     ->exec();
 
@@ -745,7 +748,7 @@ class programplanModel extends model
                 $this->dao->insert(TABLE_PROJECT)->data($plan)
                     ->autoCheck()
                     ->batchCheck($this->config->programplan->create->requiredFields, 'notempty')
-                    ->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
+                    ->checkIF(!empty($data->percent) and $setPercent, 'percent', 'float')
                     ->exec();
 
                 if(!dao::isError())
@@ -754,6 +757,9 @@ class programplanModel extends model
                     if($stageID)  $stageID = (int)$stageID;
                     if(!$stageID) dao::$errors['name'] = $this->lang->fail;
 
+                    /* Ipd project create default review points. */
+                    if($project->model == 'ipd' && $this->config->edition == 'ipd' && !$parentID) $this->loadModel('review')->createDefaultPoint($projectID, $productID, $data->attribute);
+
                     if($plan->type == 'kanban')
                     {
                         $execution = $this->execution->getByID($stageID);
@@ -849,10 +855,9 @@ class programplanModel extends model
         {
             $path['path']  = $parent->path . "{$stage->id},";
             $path['grade'] = $parent->grade + 1;
-
-            $children = $this->execution->getChildExecutions($planID);
         }
 
+        $children = $this->execution->getChildExecutions($planID);
         $this->dao->update(TABLE_PROJECT)->set('path')->eq($path['path'])->set('grade')->eq($path['grade'])->where('id')->eq($stage->id)->exec();
 
         if(!empty($children))
@@ -889,7 +894,7 @@ class programplanModel extends model
         if(in_array($this->config->edition, array('max', 'ipd')))
         {
             $plan->planDuration = $this->getDuration($plan->begin, $plan->end);
-            $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
+            if(isset($plan->realBegan) && isset($plan->realEnd)) $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
         }
 
         if($planChanged) $plan->version = $oldPlan->version + 1;
@@ -1151,7 +1156,6 @@ class programplanModel extends model
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id=t2.project')
             ->where('t2.product')->eq($productID)
             ->andWhere('t1.project')->eq($projectID)
-            ->andWhere('t1.type')->eq('stage')
             ->andWhere('t1.milestone')->eq(1)
             ->andWhere('t1.deleted')->eq(0)
             ->orderBy('t1.begin asc,path')
@@ -1209,7 +1213,7 @@ class programplanModel extends model
         if(empty($stage) || empty($stage->path)) return false;
 
         $project = $this->loadModel('project')->getByID($stage->project);
-        if(empty($stage) or empty($stage->path) or (!in_array($project->model, array('waterfall','waterfallplus','ipd')))) return false;
+        if(empty($stage) or empty($stage->path) or (!in_array($project->model, array('waterfall','waterfallplus','ipd','research')))) return false;
 
         $action       = strtolower($action);
         $parentIdList = explode(',', trim($stage->path, ','));
@@ -1393,4 +1397,35 @@ class programplanModel extends model
 
         return $stageAttribute;
     }
+
+    /**
+     * Get five days ago.
+     *
+     * @param  string $date
+     * @param  int    $date
+     * @access public
+     * @return string
+     */
+    public function getReviewDeadline(string $date, int $counter = 5)
+    {
+        if(helper::isZeroDate($date)) return '';
+
+        $weekend_days = [6, 7];
+
+        $timestamp = strtotime($date);
+        $i         = 0;
+        $this->loadModel('holiday');
+        while($i < $counter)
+        {
+            $timestamp   = strtotime('-1 day', $timestamp);
+            $weekday     = date('N', $timestamp);
+            $currentDate = date('Y-m-d', $timestamp);
+            if(!in_array($weekday, $weekend_days) and !$this->holiday->isHoliday($currentDate))
+            {
+                $i ++;
+            }
+        }
+
+        return date('Y-m-d', $timestamp);
+    }
 }
diff --git a/module/programplan/tao.php b/module/programplan/tao.php
index c5a5b1c4d6..d9ca3e10d7 100644
--- a/module/programplan/tao.php
+++ b/module/programplan/tao.php
@@ -56,15 +56,19 @@ class programplanTao extends programplanModel
      */
     protected function getParentStages(int $executionID, int $planID, int $productID): array|false
     {
-        $parentStage = $this->dao->select('t2.id, t2.name')->from(TABLE_PROJECTPRODUCT)
-            ->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-            ->where('t1.product')->eq($productID)
-            ->andWhere('t2.project')->eq($executionID)
-            ->andWhere('t2.type')->eq('stage')
-            ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t2.path')->notlike("%,$planID,%")
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
-            ->orderBy('t2.id desc')
+        $parentStage = $this->dao->select('t1.id, t1.name')->from(TABLE_PROJECT)->alias('t1')
+            ->beginIF($productID)
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
+            ->fi()
+            ->where('t1.project')->eq($executionID)
+            ->beginIF($productID)
+            ->andWhere('t2.product')->eq($productID)
+            ->fi()
+            ->andWhere('t1.type')->eq('stage')
+            ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t1.path')->notlike("%,$planID,%")
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
+            ->orderBy('t1.id desc')
             ->fetchPairs();
 
         if(dao::isError()) return false;
@@ -100,6 +104,7 @@ class programplanTao extends programplanModel
         {
             if($parent->status != 'closed')
             {
+                if($project->model == 'ipd' and $parent->parent == $project->id) return array('newParent' => null, 'parentAction' => '');
                 $newParent    = $this->execution->buildExecutionByStatus('closed');
                 $parentAction = 'closedbychild';
             }
@@ -300,9 +305,11 @@ class programplanTao extends programplanModel
             if(isset($plans[$plan->parent])) $plans[$plan->parent]->isParent = true;
         }
 
+        $reviewDeadline = array();
         foreach($plans as $plan)
         {
             $planIdList[$plan->id] = $plan->id;
+            reviewDeadline[$plan->id]['stageEnd'] = $plan->end;
 
             $start     = helper::isZeroDate($plan->begin) ? '' : $plan->begin;
             $end       = helper::isZeroDate($plan->end)   ? '' : $plan->end;
@@ -361,10 +368,11 @@ class programplanTao extends programplanModel
      * @param  string  $selectCustom
      * @param  array   $datas
      * @param  array   $stageIndex
+     * @param  array   $reviewDeadline
      * @access protected
      * @return void
      */
-    protected function setTask(array $tasks, array $plans, string $selectCustom, array &$datas, array &$stageIndex): void
+    protected function setTask(array $tasks, array $plans, string $selectCustom, array &$datas, array &$stageIndex, array $reviewDeadline): void
     {
         $taskPri   = "<span class='label-pri label-pri-%s' title='%s'>%s</span> ";
         $today     = helper::today();
@@ -381,8 +389,19 @@ class programplanTao extends programplanModel
             $realBegan = helper::isZeroDate($task->realStarted) ? '' : $task->realStarted;
             $realEnd   = (in_array($task->status, array('done', 'closed')) and !helper::isZeroDate($task->finishedDate)) ? $task->finishedDate : '';
 
-            $start = $realBegan ? $realBegan : $estStart;
-            $end   = $realEnd   ? $realEnd   : $estEnd;
+            /* Get lastest task deadline. */
+            $taskExecutionID = $execution->parent ? $execution->parent : $execution->id;
+            if(isset($reviewDeadline[$taskExecutionID]['taskEnd']))
+            {
+                $reviewDeadline[$taskExecutionID]['taskEnd'] = $task->deadline > $reviewDeadline[$taskExecutionID]['taskEnd'] ? $task->deadline : $reviewDeadline[$taskExecutionID]['taskEnd'];
+            }
+            else
+            {
+                $reviewDeadline[$taskExecutionID]['taskEnd'] = $task->deadline;
+            }
+
+            $start = $estStart;
+            $end   = $estEnd;
             if(empty($start) and $execution) $start = $execution->begin;
             if(empty($end)   and $execution) $end   = $execution->end;
             if($start > $end) $end = $start;
@@ -505,7 +524,7 @@ class programplanTao extends programplanModel
             ->where('1 = 1')
             ->beginIF(!in_array($projectModel, array('waterfallplus', 'ipd')))->andWhere('t1.type')->eq('stage')->fi()
             ->beginIF($productID)->andWhere('t2.product')->eq($productID)->fi()
-            ->beginIF($browseType == 'all')->andWhere('t1.project')->eq($executionID)->fi()
+            ->beginIF($browseType == 'all' || $browseType == 'leaf')->andWhere('t1.project')->eq($executionID)->fi()
             ->beginIF($browseType == 'parent')->andWhere('t1.parent')->eq($executionID)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
             ->andWhere('t1.deleted')->eq('0')
@@ -606,4 +625,96 @@ class programplanTao extends programplanModel
         return $totalPercent;
     }
 
+    /**
+     * 构建IPD版本的甘特图数据。
+     * Build gantt's data for ipd edition. 
+     * 
+     * @param  array     $datas 
+     * @param  int       $projectID 
+     * @param  int       $productID 
+     * @param  string    $selectCustom 
+     * @param  array     $reviewDeadline 
+     * @access protected
+     * @return void
+     */
+    protected function buildGanttData4IPD(array $datas, int $projectID, int $productID, string $selectCustom, array $reviewDeadline)
+    {
+        $this->loadModel('review');
+        $reviewPoints = $this->dao->select('t1.*, t2.status, t2.lastReviewedDate,t2.id as reviewID')->from(TABLE_OBJECT)->alias('t1')
+        ->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.id = t2.object')
+        ->where('t1.deleted')->eq('0')
+        ->andWhere('t1.project')->eq($projectID)
+        ->andWhere('t1.product')->eq($productID)
+        ->fetchAll('id');
+
+        foreach($datas['data'] as $plan)
+        {
+            if($plan->type != 'plan') continue;
+
+            foreach($reviewPoints as $id => $point)
+            {
+                if(!isset($this->config->stage->ipdReviewPoint->{$plan->attribute})) continue;
+                if(!isset($point->status)) $point->status = '';
+
+                $categories = $this->config->stage->ipdReviewPoint->{$plan->attribute};
+                if(in_array($point->category, $categories))
+                {
+                    if($point->end and !helper::isZeroDate($point->end))
+                    {
+                        $end = $point->end;
+                    }
+                    else
+                    {
+                        $end = $reviewDeadline[$plan->id]['stageEnd'];
+                        if(strpos($point->category, "TR") !== false)
+                        {
+                            if(isset($reviewDeadline[$plan->id]['taskEnd']) and !helper::isZeroDate($reviewDeadline[$plan->id]['taskEnd']))
+                            {
+                                $end = $reviewDeadline[$plan->id]['taskEnd'];
+                            }
+                            else
+                            {
+                                $end = $this->getReviewDeadline($end);
+                            }
+                        }
+                        elseif(strpos($point->category, "DCP") !== false)
+                        {
+                            $end = $this->getReviewDeadline($end, 2);
+                        }
+                    }
+
+                    $data = new stdclass();
+                    $data->id            = $plan->id . '-' . $point->category . '-' . $point->id;
+                    $data->reviewID      = $point->reviewID;
+                    $data->type          = 'point';
+                    $data->text          = "<i class='icon-seal'></i> " . $point->title;
+                    $data->name          = $point->title;
+                    $data->attribute     = '';
+                    $data->milestone     = '';
+                    $data->owner_id      = '';
+                    $data->rawStatus     = $point->status;
+                    $data->status        = $point->status ? zget($this->lang->review->statusList, $point->status) : $this->lang->programplan->wait;
+                    $data->status        = "<span class='status-{$point->status}'>" . $data->status . '</span>';
+                    $data->begin         = $end;
+                    $data->deadline      = $end;
+                    $data->realBegan     = $point->createdDate;
+                    $data->realEnd       = $point->lastReviewedDate;;
+                    $data->parent        = $plan->id;
+                    $data->open          = true;
+                    $data->start_date    = $end;
+                    $data->endDate       = $end;
+                    $data->duration      = 1;
+                    $data->color         = isset($this->lang->programplan->reviewColorList[$point->status]) ? $this->lang->programplan->reviewColorList[$point->status] : '#FC913F';
+                    $data->progressColor = $this->lang->execution->gantt->stage->progressColor;
+                    $data->textColor     = $this->lang->execution->gantt->stage->textColor;
+                    $data->bar_height    = $this->lang->execution->gantt->bar_height;
+
+                    if($data->start_date) $data->start_date = date('d-m-Y', strtotime($data->start_date));
+
+                    if($selectCustom && strpos($selectCustom, "point") !== false && !$plan->parent) $datas['data'][$data->id] = $data;
+                }
+            }
+        }
+
+    }
 }
diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php
index 17b5c92571..b21d08b891 100644
--- a/module/programplan/ui/create.html.php
+++ b/module/programplan/ui/create.html.php
@@ -42,7 +42,7 @@ $fnGenerateStageByProductList = function() use ($productID, $productList, $proje
 /* Generate checkboxes for sub-stage management. */
 $fnGenerateSubPlanManageFields = function() use ($lang, $planID, $project, $executionType)
 {
-    if(empty($planID) || $project->model != 'waterfallplus') return div();
+    if(empty($planID) || in_array($project->model, array('waterfallplus', 'ipd'))) return div();
 
     $typeList = $project->model == 'ipd' ? $lang->stage->ipdTypeList : $lang->programplan->typeList;
 
diff --git a/module/programplan/ui/edit.html.php b/module/programplan/ui/edit.html.php
index f508a3764e..b046ff8a2b 100644
--- a/module/programplan/ui/edit.html.php
+++ b/module/programplan/ui/edit.html.php
@@ -21,6 +21,8 @@ jsVar('changeAttrLang', $lang->programplan->confirmChangeAttr);
 jsVar('isTopStage',     $isTopStage);
 jsVar('isLeafStage',    $isLeafStage);
 
+if($project->model == 'ipd') unset($config->programplan->edit->form['parent']);
+
 modalHeader
 (
     set::title($this->lang->programplan->edit),
diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index 0186c52ab9..6e2ef548d5 100755
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -13,9 +13,14 @@
 <?php chdir(__DIR__);?>
 <?php include '../../common/view/gantt.html.php';?>
 <?php if(isset($project) and $project->model == 'ipd') js::set('reviewPoints', json_encode($reviewPoints));?>
+<?php js::set('projectID', $projectID);?>
 <style>
 .submitBtn{display:none}
 .gantt_row_task:hover .submitBtn{ display: inline-block;}
+.editDeadline {display: none; line-height: normal !important; padding: 2px 6px; color: #fff !important;}
+td:hover > .editDeadline {display: inline-block !important;}
+.gantt_tree_content table {width: 100%;}
+.gantt_tree_content table td {padding: 0 !important;}
 #ganttView {height: 600px;}
 #mainContent:before {background: #fff;}
 .checkbox-primary {margin-top: 0px; margin-left: 10px;}
@@ -26,7 +31,8 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 .gantt_task_line.gantt_selected {box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 6px 0 rgba(0,0,0,.045)}
 .gantt_link_arrow_right {border-left-color: #2196F3;}
 .gantt_link_arrow_left {border-right-color: #2196F3;}
-.icon-confirm {color: #18a6fd}
+.icon-confirm {color: #18a6fd; font-size: 18px;}
+.icon-seal{font-size: 18px;}
 .gantt_task_link .gantt_line_wrapper div{background-color: #2196F3;}
 .gantt_critical_link .gantt_line_wrapper>div {background-color: #e63030 !important;}
 .gantt_critical_link.start_to_start .gantt_link_arrow_right {border-left-color: #e63030 !important;}
@@ -79,6 +85,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 #mainContent > .pull-left > .btn-group > a > .text{overflow: hidden;display: block;}
 #mainContent > .pull-right > .button-group  .text{margin-left: 0px;}
 .pull-right .icon-plus.icon-sm:before{vertical-align: 4%;}
+#ganttView .gantt_resizer{min-width: unset !important;}
 </style>
 <?php js::set('customUrl', $this->createLink('programplan', 'ajaxCustom'));?>
 <?php js::set('dateDetails', $dateDetails);?>
@@ -88,11 +95,12 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 <?php js::set('showFields', $this->config->programplan->ganttCustom->ganttFields);?>
 <?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
 <?php js::set('zooming', isset($zooming) ? $zooming : 'day');?>
+<?php js::set('canEditDeadline', common::hasPriv('review', 'edit'));?>
 <div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
   <?php if($this->app->getModuleName() == 'programplan'):?>
   <div class='btn-toolbar pull-left'>
     <div class='btn-group'>
-      <?php if($project->stageBy == 'product'):?>
+      <?php if(!empty($project->division)):?>
       <?php $viewName = $productID != 0 ? zget($productList,$productID) : $lang->product->allProduct;?>
       <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
       <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
@@ -249,7 +257,7 @@ function drawGanttToCanvas(exportType, successCallback, errorCallback)
     var $ganttDridData  = $ganttView.find('.gantt_grid_data');
 
     var ganttRowHeight = $ganttView.find('.gantt_row').first().outerHeight() || 25;
-    var ganttHeight = $ganttView.find('.gantt_grid_scale').outerHeight() + <?php echo count($stages['data'])?> * ganttRowHeight;
+    var ganttHeight = $ganttView.find('.gantt_grid_scale').outerHeight() + <?php echo count($plans['data'])?> * ganttRowHeight;
     <?php if($selectCustom == 'task'):?>
     var ganttWidth  = $ganttDridData.width() - 100;
     <?php else:?>
@@ -490,7 +498,7 @@ function validateResources(id)
     flag = true;
 
     /* Check status. */
-    if(status !== statusLang)
+    if(status !== statusLang && type != 'point')
     {
         if(type == 'task')
         {
@@ -508,9 +516,27 @@ function validateResources(id)
         return false;
     }
 
+    task.begin    = from;
+    task.deadline = (new Date(to.valueOf() - 1));;
+
+    gantt.updateTask(task.id);
+    var itemID;
+    if(type == 'task')
+    {
+        itemID = task.id.split("-")[1];
+    }
+    else if(type == 'plan')
+    {
+        itemID = task.id;
+    }
+    else if(type == 'point')
+    {
+        itemID = task.id.split("-")[2];
+    }
+
     /* Check data. */
     var postData = {
-        'id'        : type == 'task' ? task.id.split("-")[1] : task.id,
+        'id'        : itemID,
         'startDate' : from.toLocaleDateString('en-CA'),
         'endDate'   : to.toLocaleDateString('en-CA'),
         'type'      : type
@@ -551,7 +577,7 @@ $(function()
         $('#ganttView').css('height', Math.max(200, Math.floor($(window).height() - $('#footer').outerHeight() - $('#header').outerHeight() - $('#mainMenu').outerHeight() - 120)));
     };
 
-    var ganttData = $.parseJSON(<?php echo json_encode(json_encode($stages));?>);
+    var ganttData = $.parseJSON(<?php echo json_encode(json_encode($plans));?>);
     if(!ganttData.data) ganttData.data = [];
 
     <?php
@@ -569,13 +595,13 @@ $(function()
     ?>
     gantt.serverList("userList", <?php echo json_encode($userList);?>);
 
-    gantt.config.readonly            = canGanttEdit;
+    gantt.config.readonly            = canGanttEdit ? false : true;
     gantt.config.details_on_dblclick = false;
-    gantt.config.order_branch        = ganttType == 'assignedTo';
+    gantt.config.order_branch        = ganttType == 'assignedTo' ? false : true;
     gantt.config.drag_progress       = false;
     gantt.config.drag_links          = false;
-    gantt.config.drag_move           = ganttType == 'assignedTo';
-    gantt.config.drag_resize         = ganttType == 'assignedTo';
+    gantt.config.drag_move           = ganttType == 'assignedTo' ? false : true;
+    gantt.config.drag_resize         = ganttType == 'assignedTo' ? false : true;
     gantt.config.smart_rendering     = true;
     gantt.config.smart_scales        = true;
     gantt.config.static_background   = true;
@@ -590,10 +616,10 @@ $(function()
     gantt.config.columns = [];
     gantt.config.columns.push({name: 'text', width: '*', tree: true, resize: true, min_width:120, width:200});
     gantt.config.columns.push({name:"custom", label:"", align: "left", width: 40, template: getSubmitBtn});
-    if(showFields.indexOf('PM') != -1) gantt.config.columns.push({name: 'owner_id', align: 'center', resize: true, width: 80, template: function(task){return getByIdForGantt(gantt.serverList('userList'), task.owner_id)}})
+    if(showFields.indexOf('PM') != -1) gantt.config.columns.push({name: 'owner_id', align: 'left', resize: true, width: 80, template: function(task){return getByIdForGantt(gantt.serverList('userList'), task.owner_id)}})
     if(showFields.indexOf('status') != -1) gantt.config.columns.push({name: 'status', align: 'center', resize: true, width: 80});
-    gantt.config.columns.push({name: 'start_date', align: 'center', resize: true, width: 80});
-    if(showFields.indexOf('deadline') != -1) gantt.config.columns.push({name: 'end_date', align: 'center', resize: true, width: 80});
+    gantt.config.columns.push({name: 'begin', align: 'center', resize: true, width: 80});
+    if(showFields.indexOf('deadline') != -1) gantt.config.columns.push({name: 'deadline', align: 'center', resize: true, width: 140, template: getDeadlineBtn});
     gantt.config.columns.push({name: 'duration', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('estimate') != -1) gantt.config.columns.push({name: 'estimate', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('progress') != -1) gantt.config.columns.push({name: 'percent', align: 'center', resize: true, width:70, template: function(plan){ if(plan.percent) return Math.round(plan.percent) + '%';}});
@@ -604,6 +630,13 @@ $(function()
     if(showFields.indexOf('delay') != -1) gantt.config.columns.push({name: 'delay', align: 'center', resize: true, width: 60});
     if(showFields.indexOf('delayDays') != -1) gantt.config.columns.push({name: 'delayDays', align: 'center', resize: false, width: 60});
 
+    function getDeadlineBtn(task)
+    {
+        var date = task.deadline;
+        if(task.type == 'point' && canEditDeadline && (!task.rawStatus || task.rawStatus == 'fail' || task.rawStatus == 'draft')) return "<table><tr><td><span class='deadline'>" + gridDateToStr(new Date(date.valueOf())) + '</span> <a class="btn btn-primary editDeadline" title="<?php echo $lang->programplan->edit;?>"><i class="icon-common-edit icon-edit"></i> <?php echo $lang->programplan->edit;?></a></td></tr></table>';
+        return date;
+    }
+
     function getSubmitBtn(task)
     {
         if(task.type == 'point' && !task.rawStatus) return '<button class="btn btn-link submitBtn" title="<?php echo $lang->programplan->submit;?>"><i class="icon-confirm"></i></button>';
@@ -636,7 +669,9 @@ $(function()
     gantt.locale.labels.column_status       = "<?php echo $lang->statusAB;?>";
     gantt.locale.labels.column_percent      = "<?php echo $lang->programplan->percentAB;?>";
     gantt.locale.labels.column_taskProgress = "<?php echo $lang->programplan->taskProgress;?>";
+    gantt.locale.labels.column_begin        = "<?php echo $lang->programplan->begin;?>";
     gantt.locale.labels.column_start_date   = "<?php echo $lang->programplan->begin;?>";
+    gantt.locale.labels.column_deadline     = "<?php echo $lang->programplan->end;?>";
     gantt.locale.labels.column_end_date     = "<?php echo $lang->programplan->end;?>";
     gantt.locale.labels.column_realBegan    = "<?php echo $lang->programplan->realBegan;?>";
     gantt.locale.labels.column_realEnd      = "<?php echo $lang->programplan->realEnd;?>";
@@ -659,7 +694,6 @@ $(function()
     });
 
     gantt.templates.task_class     = function(start, end, task){return 'pri-' + (task.pri || 0);};
-
     gantt.templates.rightside_text = function(start, end, task)
     {
         if(typeof task.owner_id == 'undefined') return;
@@ -756,11 +790,61 @@ $(function()
     var taskModalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: '95%'});
     gantt.attachEvent('onTaskClick', function(id, e)
     {
-        if($(e.srcElement).hasClass('gantt_close') || $(e.srcElement).hasClass('gantt_open')) return false;
+        var editBtn = $(e.srcElement);
+        if(editBtn.hasClass('icon-common-edit'))
+        {
+           editBtn = editBtn.parent();
+        }
+        if(editBtn.hasClass('editDeadline'))
+        {
+           var parentID     = id.split("-")[0];
+           var stageEndDate = $("div[data-task-id='" + parentID + "']").find('div[data-column-name="end_date"] > .gantt_tree_content').text();
+           var reviewID     = id;
+           var deadlineDate = editBtn.prev().text();
+
+           editBtn.datetimepicker(
+           {
+               weekStart: 1,
+               todayBtn:  1,
+               autoclose: 1,
+               todayHighlight: 1,
+               startView: 2,
+               minView: 2,
+               forceParse: 0,
+               format: "yyyy-mm-dd",
+               startDate: new Date(),
+               endDate: new Date(stageEndDate),
+               initialDate: new Date(deadlineDate),
+           })
+           .on('changeDate', function(ev){
+               var year  = ev.date.getFullYear();
+               var month = ev.date.getMonth() + 1;
+               var day   = ev.date.getUTCDate();
+               var formattedDate = year + '-' + (month < 10 ? '0' : '') + month + '-' + (day < 10 ? '0' : '') + day;
+
+               $.post(createLink('review', 'ajaxChangeTRDeadline'), {'deadline' : formattedDate, 'id' : reviewID , 'projectID' : projectID}, function()
+               {
+                  location.reload();
+               });
+
+           })
+           .on('show', function(){
+               editBtn.css('display', 'inline-block');
+           })
+           .on('hide', function(){
+               editBtn.css('display', 'none');
+           });
+           editBtn.datetimepicker('show');
+           return false;
+        }
+
+        if(editBtn.hasClass('gantt_close') || editBtn.hasClass('gantt_open')) return false;
+
         var task = gantt.getTask(id);
         if(task.type == 'point' && task.rawStatus) location.href = createLink('review', 'view', 'reviewID=' + task.reviewID);
-        if(task.type == 'plan')                    window.parent.$.apps.open(createLink('execution', 'task', 'id=' + task.id), 'execution');
-        if($(e.srcElement).hasClass('icon-confirm'))
+        if(task.type == 'plan' && !task.isParent)  window.parent.$.apps.open(createLink('execution', 'task', 'id=' + task.id), 'execution');
+
+        if(editBtn.hasClass('icon-confirm'))
         {
             var pointAttr = JSON.parse(reviewPoints);
             var category  = id.split("-")[1];
@@ -778,6 +862,7 @@ $(function()
                 location.href = createLink('review', 'create', 'projectID=' + projectID);
             }
         }
+
         if(ganttType == 'assignedTo')
         {
             taskID = id;
@@ -859,5 +944,12 @@ $(function()
     {
         return validateResources(id);
     });
+
+    gantt.attachEvent("onRowDragStart", function(id, target, e) {
+        //any custom logic here
+        var task = gantt.getTask(id);
+        if(task.type != 'task') return false;
+        return true;
+    });
 });
 </script>
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
index 1154febd06..bb7215c6e9 100644
--- a/module/programplan/zen.php
+++ b/module/programplan/zen.php
@@ -116,6 +116,7 @@ class programplanZen extends programplan
         $this->view->title              = $this->lang->programplan->edit;
         $this->view->isCreateTask       = $this->programplan->isCreateTask($plan->id);
         $this->view->plan               = $plan;
+        $this->view->project            = $this->project->getByID($plan->project);
         $this->view->parentStageList    = $this->programplan->getParentStageList($this->session->project, $plan->id, $plan->product);
         $this->view->enableOptionalAttr = empty($parentStage) || (!empty($parentStage) && $parentStage->attribute == 'mix');
         $this->view->isTopStage         = $this->programplan->isTopStage($plan->id);
@@ -275,6 +276,12 @@ class programplanZen extends programplan
      */
     protected function buildBrowseView(int $projectID, int $productID, array $stages, string $type, string $orderBy): void
     {
+        $project = $this->project->getByID($projectID);
+        if($project->model == 'ipd' and $this->config->edition == 'ipd')
+        {
+            $this->view->reviewPoints = $this->loadModel('review')->getReviewPointByProject($projectID);
+        }
+
         $this->view->title       = $this->lang->programplan->browse;
         $this->view->projectID   = $projectID;
         $this->view->productID   = $productID;
@@ -282,7 +289,7 @@ class programplanZen extends programplan
         $this->view->ganttType   = $type;
         $this->view->stages      = $stages;
         $this->view->orderBy     = $orderBy;
-        $this->view->project     = $this->loadModel('project')->getByID($projectID);
+        $this->view->project     = $project;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter');
         $this->view->product     = $this->loadModel('product')->getByID($productID);
         $this->view->productList = $this->loadModel('product')->getProductPairsByProject($projectID, 'all', '', false);