diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 71c0cd7c0c6..25b34f0493d 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1069,6 +1069,18 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) { print ''; } + + //Check if Extrafields is totalizable + foreach ($extrafields->attributes['projet_task']['totalizable'] as $key=>$value){ + if ($arrayfields['ef.'.$key]['checked'] == 1){ + print ''; + if ($value == 1){ + print $totalarray['totalizable'][$key]['total']; + } + print ''; + } + } + print ''; print ''; } diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index a860f1205c7..a848bf4e708 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -1503,6 +1503,13 @@ while ($i < $imaxinloop) { } // Show total line +if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) { + foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) { + $totalarray['pos'][$valtotalizable['pos']] = $keytotalizable; + $totalarray['val'][$keytotalizable] = $valtotalizable['total']; + } +} + if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['totalplannedworkloadfield']) || isset($totalarray['totalprogress_calculatedfield']) || isset($totalarray['totaltobill']) || isset($totalarray['totalbilled']) || isset($totalarray['totalbudget'])) { print ''; @@ -1529,7 +1536,15 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota print ''.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).''; } elseif ($totalarray['totalbudget_amountfield'] == $i) { print ''.price($totalarray['totalbudgetamount'], 0, $langs, 1, 0, 0, $conf->currency).''; - } else { + } else if (!empty($totalarray['pos'][$i])) { + print ''; + if (isset($totalarray['type']) && $totalarray['type'][$i] == 'duration') { + print (!empty($totalarray['val'][$totalarray['pos'][$i]])?convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin'):0); + } else { + print price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0); + } + print ''; + }else { print ''; } }