From 8e78fa7abf4e75a2c613b02c9ef9969ef179d815 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 8 May 2017 10:31:41 +0800
Subject: [PATCH]  * code for task #2992.

---
 module/project/lang/zh-cn.php | 2 +-
 module/project/model.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 04bea034f8..07b2bed9aa 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -207,7 +207,7 @@ $lang->project->goback                = "返回任务列表";
 $lang->project->noweekend             = '去除周末';
 $lang->project->withweekend           = '显示周末';
 $lang->project->interval              = '间隔';
-$lang->project->fixFirstWithLeft      = '是否将该天剩余工时也设置为该值？';
+$lang->project->fixFirstWithLeft      = '是否将首天剩余工时也设置为该值？';
 
 /* 统计。*/
 $lang->project->charts = new stdclass();
diff --git a/module/project/model.php b/module/project/model.php
index b1ad1d7ef5..37028d47d8 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1563,7 +1563,7 @@ class projectModel extends model
         $data = fixer::input('post')
             ->add('project', $projectID)
             ->add('date', $project->begin)
-            ->add('left', (empty($burn) or $withLeft) ? $this->post->estimate : $burn->left)
+            ->add('left', $withLeft ? $this->post->estimate : $burn->left)
             ->add('consumed', empty($burn) ? 0 : $burn->consumed)
             ->get();
         if(!is_numeric($data->estimate)) return false;