*Finish task #45148.

module/project/lang/en.php

@@ -108,10 +108,10 @@ $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
 $lang->project->dateRange          = 'Duration';
 $lang->project->to                 = ' to ';
-$lang->project->realEnd            = 'Actual End';
+$lang->project->realBeganAB        = 'Actual Begin';
+$lang->project->realEndAB          = 'Actual End';
 $lang->project->realBegan          = 'Actual Begin';
-$lang->project->realEndDate        = 'Actual End';
-$lang->project->realBeganDate      = 'Actual Begin';
+$lang->project->realEnd            = 'Actual End';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
@@ -180,7 +180,7 @@ $lang->project->unlinkExecutionMember  = "The user participated in %s executions
 $lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
 
 $lang->project->realEndNotEmpty  = 'Actual End should not be empty.';
-$lang->project->realEndNotFuture = 'Actual End should not be a future date.';
+$lang->project->realEndNotFuture = 'Actual End should be < = today.';
 
 $lang->project->tenThousand = '';
 

module/project/lang/zh-cn.php

@@ -108,10 +108,10 @@ $lang->project->surplus            = '剩余';
 $lang->project->progress           = '进度';
 $lang->project->dateRange          = '起止日期';
 $lang->project->to                 = '至';
-$lang->project->realEnd            = '实际完成';
-$lang->project->realBegan          = '实际开始';
-$lang->project->realEndDate        = '实际完成日期';
-$lang->project->realBeganDate      = '实际开始日期';
+$lang->project->realBeganAB        = '实际开始';
+$lang->project->realEndAB          = '实际完成';
+$lang->project->realBegan          = '实际开始日期';
+$lang->project->realEnd            = '实际完成日期';
 $lang->project->bygrid             = '看板';
 $lang->project->bylist             = '列表';
 $lang->project->bycard             = '卡片';
@@ -180,7 +180,7 @@ $lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->exe
 $lang->project->unlinkExecutionMembers = "移除的团队成员还参与了项目下的执行，是否同步从执行团队中移除？";
 
 $lang->project->realEndNotEmpty        = "实际完成不能为空。";
-$lang->project->realEndNotFuture       = "实际完成不能为未来日期。";
+$lang->project->realEndNotFuture       = "实际完成不能大于当前日期。";
 
 $lang->project->tenThousand = '万';
 

module/project/model.php

@@ -1283,24 +1283,24 @@ class projectModel extends model
             ->remove('comment')
             ->get();
 
+        if($project->realEnd == '')
+        {
+            dao::$errors['realEnd'] = $this->lang->project->realEndNotEmpty;
+            return false;
+        }
+        if($project->realEnd > $now)
+        {
+            dao::$errors['realEnd'] = $this->lang->project->realEndNotFuture; 
+            return false;
+        }
+
         $this->dao->update(TABLE_PROJECT)->data($project)
             ->autoCheck()
             ->where('id')->eq((int)$projectID)
             ->exec();
+
         if(!dao::isError())
-        {
-            if($project->realEnd == '')
-            {
-                dao::$errors['realEnd'] = $this->lang->project->realEndNotEmpty;
-                return false;
-            }
-
-            if($project->realEnd > $now)
-            {
-                dao::$errors['realEnd'] = $this->lang->project->realEndNotFuture; 
-                return false;
-            }
-
+        {            
             $this->loadModel('score')->create('project', 'close', $oldProject);
             return common::createChanges($oldProject, $project);
         }

module/project/view/close.html.php

@@ -31,7 +31,7 @@
         </tr>
         <?php $this->printExtendFields($project, 'table');?>
         <tr>
-          <th><?php echo $lang->project->realEndDate;?></th>
+          <th><?php echo $lang->project->realEnd;?></th>
           <td>
             <div class='w-150px'>       
               <?php echo html::input('realEnd',(!empty($project->realEnd) && $project->realEnd != '0000-00-00' ? $project->realEnd : date('Y-m-d')), "class='form-control form-date' required");?>

module/project/view/view.html.php

@@ -178,13 +178,13 @@
                   <tr>
                     <th><?php echo $lang->project->begin;?></th>
                     <td><?php echo $project->begin;?></td>
-                    <th><?php echo $lang->project->realBegan;?></th>
+                    <th><?php echo $lang->project->realBeganAB;?></th>
                     <td><?php echo $project->realBegan == '0000-00-00' ? '' : $project->realBegan;?></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->project->end;?></th>
                     <td><?php echo $project->end;?></td>
-                    <th><?php echo $lang->project->realEnd;?></th>
+                    <th><?php echo $lang->project->realEndAB;?></th>
                     <td><?php echo $project->realEnd == '0000-00-00' ? '' : $project->realEnd;?></td>
                   </tr>
                   <tr>