From f34bce05bf6c32e24d27168591efcc6a033c7d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 23 Feb 2022 17:00:55 +0800
Subject: [PATCH 1/2]  * code for task #49401.

---
 module/execution/view/all.html.php    |  6 ++-
 module/task/model.php                 |  4 +-
 module/todo/model.php                 |  3 +-
 module/todo/view/batchcreate.html.php | 58 +++++++++++++--------------
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 9389fca476..4ef7797cb9 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -91,6 +91,8 @@
           <th class='c-realEnd'><?php common::printOrderLink('realEnd', $orderBy, $vars, $lang->execution->realEnd);?></th>
           <th class='c-action'><?php echo $lang->actions;?></th>
           <?php else:;?>
+          <th class='c-begin'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->execution->begin);?></th>
+          <th class='c-end'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
           <th class='c-estimate text-right hours'><?php echo $lang->execution->totalEstimate;?></th>
           <th class='c-consumed text-right hours'><?php echo $lang->execution->totalConsumed;?></th>
           <th class='c-left text-right hours'><?php echo $lang->execution->totalLeft;?></th>
@@ -118,7 +120,7 @@
             <?php printf('%03d', $execution->id);?>
           </td>
           <td class='text-left c-name <?php if(!empty($execution->children)) echo 'has-child';?> flex' title='<?php echo $execution->name?>'>
-            <?php if($config->systemMode == 'new'):?> 
+            <?php if($config->systemMode == 'new'):?>
             <span class='project-type-label label label-outline <?php echo $execution->type == 'stage' ? 'label-warning' : 'label-info';?>'><?php echo $lang->execution->typeList[$execution->type]?></span>
             <?php endif;?>
             <?php
@@ -175,6 +177,8 @@
                 }
             ?></td>
           <?php else:?>
+          <td><?php echo helper::isZeroDate($execution->begin) ? '' : $execution->begin;?></td>
+          <td><?php echo helper::isZeroDate($execution->end)   ? '' : $execution->end;?></td>
           <td class='hours' title='<?php echo $execution->hours->totalEstimate . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalEstimate . $this->lang->execution->workHourUnit;?></td>
           <td class='hours' title='<?php echo $execution->hours->totalConsumed . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalConsumed . $this->lang->execution->workHourUnit;?></td>
           <td class='hours' title='<?php echo $execution->hours->totalLeft     . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalLeft     . $this->lang->execution->workHourUnit;?></td>
diff --git a/module/task/model.php b/module/task/model.php
index c7df38e81e..b0d6152ae3 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2526,7 +2526,7 @@ class taskModel extends model
 
         $lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($estimate->task)->orderBy('date desc,id desc')->limit(1)->fetch();
         $consumed     = $task->consumed - $estimate->consumed;
-        $left         = $lastEstimate->left ? $lastEstimate->left : $estimate->left;
+        $left         = isset($lastEstimate->left) ? $lastEstimate->left : $estimate->left;
 
         $data = new stdclass();
         $data->consumed = $consumed;
@@ -2551,7 +2551,7 @@ class taskModel extends model
 
         $this->dao->update(TABLE_TASK)->data($data) ->where('id')->eq($estimate->task)->exec();
         if($task->parent > 0) $this->updateParentStatus($task->id);
-        if($task->story)  $this->loadModel('story')->setStage($oldTask->story);
+        if($task->story)  $this->loadModel('story')->setStage($task->story);
 
         $oldTask = new stdClass();
         $oldTask->consumed = $task->consumed;
diff --git a/module/todo/model.php b/module/todo/model.php
index d842163c4e..6336923bf3 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -30,6 +30,7 @@ class todoModel extends model
         $todo = fixer::input('post')
             ->add('account', $this->app->user->account)
             ->setDefault('idvalue', 0)
+            ->setDefault('vision', $this->config->vision)
             ->setDefault('assignedTo', $this->app->user->account)
             ->setDefault('assignedBy', $this->app->user->account)
             ->setDefault('assignedDate', helper::now())
@@ -175,7 +176,7 @@ class todoModel extends model
                 $todo->assignedTo   = $this->app->user->account;
                 $todo->assignedBy   = $this->app->user->account;
                 $todo->assignedDate = $now;
-                $todo->vision       = $todos->vision[$i];
+                $todo->vision       = $this->config->vision;
 
                 if(in_array($todo->type, $this->config->todo->moduleList)) $todo->idvalue = isset($todos->{$this->config->todo->objectList[$todo->type]}[$i + 1]) ? $todos->{$this->config->todo->objectList[$todo->type]}[$i + 1] : 0;
 
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 1d1b307da9..4fb05c2e10 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -14,34 +14,34 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
-<form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>'>
-  <div id="mainContent">
-    <div class="main-header">
-      <h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>
-      <div class="input-group pull-left">
-        <span class="input-group-addon"><?php echo $lang->todo->date;?></span>
-        <input type="text" name="date" id='date' value="<?php echo $date;?>" class="form-control form-date" autocomplete="off" />
-        <span class="input-group-addon">
-          <div class="checkbox-primary">
-            <input type='checkbox' name='switchDate' id='switchDate' class='control-time-switch 'onclick='switchDateTodo(this);' />
-            <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
-          </div>
-        </span>
-      </div>
-      <div id='formSettingBtn' class='pull-right btn-toolbar'>
-        <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=todo&section=custom&key=batchCreateFields')?>
-        <?php include '../../common/view/customfield.html.php';?>
-        <div class="divider"></div>
-      </div>
+<div id="mainContent">
+  <div class="main-header">
+    <h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>
+    <div class="input-group pull-left">
+      <span class="input-group-addon"><?php echo $lang->todo->date;?></span>
+      <input type="text" name="date" id='date' value="<?php echo $date;?>" class="form-control form-date" autocomplete="off" />
+      <span class="input-group-addon">
+        <div class="checkbox-primary">
+          <input type='checkbox' name='switchDate' id='switchDate' class='control-time-switch 'onclick='switchDateTodo(this);' />
+          <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
+        </div>
+      </span>
     </div>
-    <?php
-    $visibleFields = array();
-    foreach(explode(',', $showFields) as $field)
-    {
-        if($field)$visibleFields[$field] = '';
-    }
-    $columns = count($visibleFields) + 2;
-    ?>
+    <div id='formSettingBtn' class='pull-right btn-toolbar'>
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=todo&section=custom&key=batchCreateFields')?>
+      <?php include '../../common/view/customfield.html.php';?>
+      <div class="divider"></div>
+    </div>
+  </div>
+  <?php
+  $visibleFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field)$visibleFields[$field] = '';
+  }
+  $columns = count($visibleFields) + 2;
+  ?>
+  <form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>'>
     <table class='table table-form table-fixed with-border'>
       <thead>
         <tr>
@@ -88,8 +88,8 @@
         <tr><td class='text-center form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton() . html::backButton();?></td></tr>
       </tfoot>
     </table>
-  </div>
-</form>
+  </form>
+</div>
 
 <script>
 var $form = $('#todoBatchAddForm').on('change', '.control-time-switch', function()

From c8a9e2b6b99776e6c33202de408d5fe3773b0a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 23 Feb 2022 17:25:14 +0800
Subject: [PATCH 2/2]  * code for task #49087.

---
 extension/lite/group/ext/lang/resource.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php
index 1bcaa18cee..f88d644c02 100644
--- a/extension/lite/group/ext/lang/resource.php
+++ b/extension/lite/group/ext/lang/resource.php
@@ -938,6 +938,8 @@ if($config->edition == 'biz' or $config->edition == 'max')
     $lang->resource->feedback->close      = 'closeAction';
     $lang->resource->feedback->export     = 'exportAction';
 
+    if($config->visions == ',lite,') unset($lang->resource->feedback);
+
     /* Faq. */
     $lang->resource->faq = new stdclass();
     $lang->resource->faq->browse = 'browse';