diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 3885797a012..e9c594e3648 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1985,23 +1985,23 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide // this conf is actually hidden, by default we use 1% for "be carefull or warning" $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01; - $diffTitle = '
'.$langs->trans('ProgressDeclared').' : '.price($task->progress).'%'; - $diffTitle.= '
'.$langs->trans('ProgressCalculated').' : '.price($progressCalculated).'%'; + $diffTitle = '
'.$langs->trans('ProgressDeclared').' : '.$task->progress.'%'; + $diffTitle.= '
'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.'%'; if($progressCalculated > doubleval($task->progress)){ $progressBarClass = 'progress-bar-danger'; - $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%'); - $diff = ' '.price($task->progress-$progressCalculated).'%'; + $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%'); + $diff = ' '.($task->progress-$progressCalculated).'%'; } elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1% $progressBarClass = 'progress-bar-warning'; - $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%'); - $diff = ' '.price($task->progress-$progressCalculated).'%'; + $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%'); + $diff = ' '.($task->progress-$progressCalculated).'%'; } else{ $progressBarClass = 'progress-bar-success'; - $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', price($task->progress-$progressCalculated).'%'); - $diff = ' '.price($task->progress-$progressCalculated).'%'; + $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).'%'); + $diff = ' '.($task->progress-$progressCalculated).'%'; } } @@ -2048,7 +2048,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide $out.= ''; - $out.= '
'; + $out.= '
'; $out.= '
'; $out.= '
'; $out.= '
'; @@ -2095,7 +2095,7 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '') } if(empty($label)){ - $label = price($task->progress).' %'; + $label = $task->progress.' %'; } if(!empty($label)){