lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fix

Browse Source
This commit is contained in:
Alexandre SPANGARO 2018-08-01 07:46:17 +02:00
parent 0509a176ca
commit ee61a88540
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -508,13 +508,11 @@ class PaymentSalary extends CommonObject
global $langs; global $langs;
$result=''; $result='';
$label=$langs->trans("ShowSalaryPayment").': '.$this->ref; $label=$langs->trans("ShowSalaryPayment").': '.$this->ref;
$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; $linkstart = '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
$linkend='</a>'; $linkend='</a>';
$picto='payment';
$result .= $linkstart; $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) $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; if ($withpicto != 2) $result.= $this->ref;

8
htdocs/projet/element.php
View File

@ -879,13 +879,9 @@ foreach ($listofreferent as $key => $value)
{ {
print $expensereport->getNomUrl(1); print $expensereport->getNomUrl(1);
} }
if ($tablename == 'payment_salary')
{
print '';
}
else else
{ {
// Show ref with link // Show ref with link
if ($element instanceof Task) if ($element instanceof Task)
{ {
print $element->getNomUrl(1,'withproject','time'); print $element->getNomUrl(1,'withproject','time');
@ -969,7 +965,7 @@ foreach ($listofreferent as $key => $value)
else if ($tablename == 'payment_salary') else if ($tablename == 'payment_salary')
{ {
$tmpuser=new User($db); $tmpuser=new User($db);
$tmpuser->fetch($salaries->fk_user); $tmpuser->fetch($element->fk_user);
print $tmpuser->getNomUrl(1,'',48); print $tmpuser->getNomUrl(1,'',48);
} }
else if ($tablename == 'don' || $tablename == 'stock_mouvement') else if ($tablename == 'don' || $tablename == 'stock_mouvement')