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'; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 01b7156bfa..98525faf8e 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -93,6 +93,8 @@ execution->realEnd);?> actions;?> + execution->begin);?> + execution->end);?> execution->totalEstimate;?> execution->totalConsumed;?> execution->totalLeft;?> @@ -120,7 +122,7 @@ id);?> flex' title='name?>'> - systemMode == 'new'):?> + systemMode == 'new'):?> '>execution->typeList[$execution->type]?> + begin) ? '' : $execution->begin;?> + end) ? '' : $execution->end;?> lang->execution->workHour;?>'>hours->totalEstimate . $this->lang->execution->workHourUnit;?> lang->execution->workHour;?>'>hours->totalConsumed . $this->lang->execution->workHourUnit;?> lang->execution->workHour;?>'>hours->totalLeft . $this->lang->execution->workHourUnit;?> diff --git a/module/task/model.php b/module/task/model.php index 4abeb523f7..ade2de9249 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2555,7 +2555,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; @@ -2580,7 +2580,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 f863864f26..2570954009 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 @@ todo->moduleList)?> todo->getUserObjectsMethod)?> -
'> -
-
-

todo->batchCreate . $lang->todo->common;?>

-
- todo->date;?> - - -
- - -
-
-
-
- createLink('custom', 'ajaxSaveCustomFields', 'module=todo§ion=custom&key=batchCreateFields')?> - -
-
+
+
+

todo->batchCreate . $lang->todo->common;?>

+
+ todo->date;?> + + +
+ + +
+
- +
+ createLink('custom', 'ajaxSaveCustomFields', 'module=todo§ion=custom&key=batchCreateFields')?> + +
+
+
+ + '> @@ -88,8 +88,8 @@
'>
-
- + +