diff --git a/module/execution/config.php b/module/execution/config.php index 6432650c26..a95b322d40 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -8,7 +8,7 @@ $config->execution->ownerFields = array('PO', 'PM', 'QD', 'RD'); $config->execution->defaultBurnPeriod = 30; $config->execution->list = new stdclass(); -$config->execution->list->exportFields = 'id,name,projectName,PM,begin,end,status,totalEstimate,totalConsumed,totalLeft,progress'; +$config->execution->list->exportFields = 'id,name,projectName,PM,begin,end,status,estimate,consumed,left,progress'; $config->execution->modelList['scrum'] = 'sprint'; $config->execution->modelList['waterfall'] = 'stage'; diff --git a/module/execution/control.php b/module/execution/control.php index 8de49168ca..1e2376a043 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -4213,10 +4213,7 @@ class execution extends control { $execution->PM = zget($users, $execution->PM); $execution->status = isset($execution->delay) ? $executionLang->delayed : $this->processStatus('execution', $execution); - $execution->totalEstimate = $execution->hours->totalEstimate; - $execution->totalConsumed = $execution->hours->totalConsumed; - $execution->totalLeft = $execution->hours->totalLeft; - $execution->progress = $execution->hours->progress . '%'; + $execution->progress .= '%'; $execution->name = isset($execution->title) ? $execution->title : $execution->name; if($this->app->tab == 'project' and ($project->model == 'agileplus' or $project->model == 'waterfallplus')) $execution->method = zget($executionLang->typeList, $execution->type);