diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index ba68cfbab0..aeabeeebac 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -31,7 +31,7 @@
execution->noExecution;?> - createLink('execution', 'create', "projectID=$projectID"), " " . $lang->execution->createKanban, '', "class='btn btn-info' data-app='project'");?> + createLink('execution', 'create', "projectID=$projectID"), " " . $lang->project->createKanban, '', "class='btn btn-info' data-app='project'");?>
diff --git a/module/report/model.php b/module/report/model.php index f5377e35a3..c736543d08 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -311,8 +311,8 @@ class reportModel extends model $project[$execution->projectname]['execution'][$name]['count'] = 0; $project[$execution->projectname]['execution'][$name]['manhour'] = 0; - $workload[$member]['total']['count'] = 0; - $workload[$member]['total']['manhour'] = 0; + $workload[$member]['total']['count'] = 0; + $workload[$member]['total']['manhour'] = 0; } } $workload[$member]['task']['project'] = $project; diff --git a/module/task/model.php b/module/task/model.php index 4482e1639f..c7df38e81e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2497,7 +2497,7 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->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;