From 531bfe217b14c816d88f41fc0ff0ce1b07bdfb00 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 18 Jun 2020 15:11:35 +0200 Subject: [PATCH] Merge fields --- htdocs/core/lib/project.lib.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 0fa9a3ed0bb..eb1157353d8 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -2249,15 +2249,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks } print ''; - if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency); - print ''; - print ''; if ($objp->opp_percent && $objp->opp_amount) { $opp_weighted_amount = $objp->opp_percent * $objp->opp_amount / 100; - print price($opp_weighted_amount, 0, '', 1, -1, -1, $conf->currency); + $alttext = price($opp_weighted_amount, 0, '', 1, -1, -1, $conf->currency); $ponderated_opp_amount += price2num($opp_weighted_amount); } - print ''; + if ($objp->opp_amount) print ''.price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency).''; + print ''; } if (empty($conf->global->PROJECT_HIDE_TASKS))