From fb84d28b4a6495021722efbc6ad4c2210eb8b1fa Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 6 Dec 2021 15:04:49 +0800
Subject: [PATCH] * Fix bug #17128.

---
 module/programplan/lang/en.php |  4 ++++
 module/programplan/model.php   | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index de70969dc4..0a1830767e 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -53,6 +53,10 @@ $lang->programplan->hideCriticalPath = 'Hide Critical Path';
 $lang->programplan->showCriticalPath = 'Show Critical Path';
 $lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
 $lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
+$lang->programplan->emptyBegin       = '『Begin』should not be blank';
+$lang->programplan->emptyEnd         = '『End』should not be blank';
+$lang->programplan->checkBegin       = '『Begin』should be valid date';
+$lang->programplan->checkEnd         = '『End』should be valid date';
 
 $lang->programplan->milestoneList[1] = 'Yes';
 $lang->programplan->milestoneList[0] = 'No';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 15beca9b72..698a01937b 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -447,7 +447,7 @@ class programplanModel extends model
                 dao::$errors['message'][] = $this->lang->programplan->error->percentNumber;
                 return false;
             }
-            if($plan->begin == '0000-00-00')
+            if(helper::isZeroDate($plan->begin))
             {
                 dao::$errors['message'][] = $this->lang->programplan->emptyBegin;
                 return false;
@@ -457,7 +457,7 @@ class programplanModel extends model
                 dao::$errors['message'][] = $this->lang->programplan->checkBegin;
                 return false;
             }
-            if($plan->end == '0000-00-00')
+            if(helper::isZeroDate($plan->end))
             {
                 dao::$errors['message'][] = $this->lang->programplan->emptyEnd;
                 return false;
@@ -467,7 +467,7 @@ class programplanModel extends model
                 dao::$errors['message'][] = $this->lang->programplan->checkEnd;
                 return false;
             }
-            if($plan->end != '0000-00-00' and $plan->end < $plan->begin)
+            if(!helper::isZeroDate($plan->end) and $plan->end < $plan->begin)
             {
                 dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;
                 return false;
@@ -482,14 +482,14 @@ class programplanModel extends model
                 dao::$errors['message'][] = sprintf($this->lang->programplan->errorBegin, $project->begin);
                 return false;
             }
-            if($plan->end != '0000-00-00' and $plan->end > $project->end)
+            if(!helper::isZeroDate($plan->end) and $plan->end > $project->end)
             {
                 dao::$errors['message'][] = sprintf($this->lang->programplan->errorEnd, $project->end);
                 return false;
             }
 
-            if($plan->begin == '0000-00-00') $plan->begin = '';
-            if($plan->end   == '0000-00-00') $plan->end   = '';
+            if(helper::isZeroDate($plan->begin)) $plan->begin = '';
+            if(helper::isZeroDate($plan->end)) $plan->end   = '';
             foreach(explode(',', $this->config->programplan->create->requiredFields) as $field)
             {
                 $field = trim($field);