diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index e57b02f1293..19e213d48cf 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -1417,46 +1417,46 @@ if ($resql) { if ($links[$key]['type'] == 'withdraw') { $banktransferstatic->id = $links[$key]['url_id']; $banktransferstatic->ref = $links[$key]['label']; - print $banktransferstatic->getNomUrl(0); + print $banktransferstatic->getNomUrl(0).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment') { $paymentstatic->id = $links[$key]['url_id']; $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment $paymentstatic->date = $db->jdate($objp->do); - print $paymentstatic->getNomUrl(2); + print $paymentstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_supplier') { $paymentsupplierstatic->id = $links[$key]['url_id']; $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment - print $paymentsupplierstatic->getNomUrl(2); + print $paymentsupplierstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_sc') { $paymentscstatic->id = $links[$key]['url_id']; $paymentscstatic->ref = $links[$key]['url_id']; $paymentscstatic->label = $links[$key]['label']; - print $paymentscstatic->getNomUrl(2); + print $paymentscstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_vat') { $paymentvatstatic->id = $links[$key]['url_id']; $paymentvatstatic->ref = $links[$key]['url_id']; - print $paymentvatstatic->getNomUrl(2); + print $paymentvatstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_salary') { $paymentsalstatic->id = $links[$key]['url_id']; $paymentsalstatic->ref = $links[$key]['url_id']; $paymentsalstatic->label = $links[$key]['label']; - print $paymentsalstatic->getNomUrl(2); + print $paymentsalstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_loan') { print ''; print ' '.img_object($langs->trans('ShowPayment'), 'payment').' '; - print ' '; + print ''.($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_donation') { $paymentdonationstatic->id = $links[$key]['url_id']; $paymentdonationstatic->ref = $links[$key]['url_id']; - print $paymentdonationstatic->getNomUrl(2); + print $paymentdonationstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_expensereport') { $paymentexpensereportstatic->id = $links[$key]['url_id']; $paymentexpensereportstatic->ref = $links[$key]['url_id']; - print $paymentexpensereportstatic->getNomUrl(2); + print $paymentexpensereportstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'payment_various') { $paymentvariousstatic->id = $links[$key]['url_id']; $paymentvariousstatic->ref = $links[$key]['url_id']; - print $paymentvariousstatic->getNomUrl(2); + print $paymentvariousstatic->getNomUrl(2).($labeltoshow ? ' ' : ''); } elseif ($links[$key]['type'] == 'banktransfert') { // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail. if ($objp->amount > 0) { @@ -1469,7 +1469,7 @@ if ($resql) { $bankstatic->id = $objp->bankid; $bankstatic->label = $objp->bankref; print $bankstatic->getNomUrl(1, ''); - print ' - '; + print ($labeltoshow ? ' - ' : ''); } else { $bankstatic->id = $objp->bankid; $bankstatic->label = $objp->bankref; @@ -1480,7 +1480,7 @@ if ($resql) { $bankstatic->id = $banklinestatic->fk_account; $bankstatic->label = $banklinestatic->bank_account_ref; print $bankstatic->getNomUrl(1, 'transactions'); - print ' - '; + print ($labeltoshow ? ' - ' : ''); } //var_dump($links); } elseif ($links[$key]['type'] == 'company') { @@ -1550,7 +1550,7 @@ if ($resql) { // Payment type if (!empty($arrayfields['type']['checked'])) { - print ''; + print ''; $labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1); if ($labeltype == 'SOLD') { print ' '; //$langs->trans("InitialBankBalance"); @@ -1783,7 +1783,7 @@ if ($resql) { $totalarray['nbfield']++; } - print ""; + print "\n"; $i++; } diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php index 0f3b4458b66..a8ed7652d9d 100644 --- a/htdocs/salaries/class/paymentsalary.class.php +++ b/htdocs/salaries/class/paymentsalary.class.php @@ -758,7 +758,7 @@ class PaymentSalary extends CommonObject $link = ''; $linkend = ''; - if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip pictofixedwidth"').$linkend); + if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend); if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend; }