* Fix bug #16055.

module/programplan/lang/en.php

@@ -16,7 +16,7 @@ $lang->programplan->list          = 'Stage List';
 $lang->programplan->create        = 'Create';
 $lang->programplan->edit          = 'Edit';
 $lang->programplan->delete        = 'Delete Stage';
-$lang->programplan->createSubPlan = 'Create Sub Plan';
+$lang->programplan->createSubPlan = 'Create Sub Stage';
 
 $lang->programplan->parent           = 'Parent Stage';
 $lang->programplan->emptyParent      = 'N/A';

module/programplan/lang/zh-cn.php

@@ -71,3 +71,4 @@ $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"
 $lang->programplan->error->percentOver     = '工作量占比累计不应当超过100%';
 $lang->programplan->error->createdTask     = '已分解任务,不可添加子阶段';
 $lang->programplan->error->parentWorkload  = '子阶段的工作量之和不能大于父阶段的工作量:%s';
+$lang->programplan->error->parentDuration  = '子阶段计划开始、计划完成不能超过父阶段';

module/programplan/model.php

@@ -450,6 +450,11 @@ class programplanModel extends model
                 dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;
                 return false;
             }
+            if(isset($parentStage) and ($plan->end > $parentStage->end || $plan->begin < $parentStage->begin))
+            {
+                dao::$errors['message'][] = $this->lang->programplan->error->parentDuration;
+                return false;
+            }
 
             if($plan->begin == '0000-00-00') $plan->begin = '';
             if($plan->end   == '0000-00-00') $plan->end   = '';