From ee61a8854082bf8ab8b8109372636d9178a35cb2 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Wed, 1 Aug 2018 07:46:17 +0200 Subject: [PATCH] Small fix --- htdocs/compta/salaries/class/paymentsalary.class.php | 6 ++---- htdocs/projet/element.php | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 2e656907aa7..31c616ac00d 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -508,13 +508,11 @@ class PaymentSalary extends CommonObject global $langs; $result=''; - $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; + $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; - $linkstart = ''; + $linkstart = ''; $linkend=''; - $picto='payment'; - $result .= $linkstart; if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1); if ($withpicto != 2) $result.= $this->ref; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 842527f4bbd..7a263ba3995 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -879,13 +879,9 @@ foreach ($listofreferent as $key => $value) { print $expensereport->getNomUrl(1); } - if ($tablename == 'payment_salary') - { - print ''; - } else { - // Show ref with link + // Show ref with link if ($element instanceof Task) { print $element->getNomUrl(1,'withproject','time'); @@ -969,7 +965,7 @@ foreach ($listofreferent as $key => $value) else if ($tablename == 'payment_salary') { $tmpuser=new User($db); - $tmpuser->fetch($salaries->fk_user); + $tmpuser->fetch($element->fk_user); print $tmpuser->getNomUrl(1,'',48); } else if ($tablename == 'don' || $tablename == 'stock_mouvement')