diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f9bc453d999..7d8b819b75c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -672,27 +672,27 @@ if (!empty($date_start) && !empty($date_stop))
} elseif ($data['item'] == 'ExpenseReport') {
$expensereport->id = $data['id'];
$expensereport->ref = $data['ref'];
- print $expensereport->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
} elseif ($data['item'] == 'SalaryPayment') {
$salary_payment->id = $data['id'];
$salary_payment->ref = $data['ref'];
- print $salary_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $salary_payment->getNomUrl(1, '', 0, '', 0);
} elseif ($data['item'] == 'Donation') {
$don->id = $data['id'];
$don->ref = $data['ref'];
- print $don->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $don->getNomUrl(1, 0, '', 0);
} elseif ($data['item'] == 'SocialContributions') {
$charge_sociales->id = $data['id'];
$charge_sociales->ref = $data['ref'];
- print $charge_sociales->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
} elseif ($data['item'] == 'VariousPayment') {
$various_payment->id = $data['id'];
$various_payment->ref = $data['ref'];
- print $various_payment->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $various_payment->getNomUrl(1, '', 0, 0);
} elseif ($data['item'] == 'LoanPayment') {
$payment_loan->id = $data['id'];
$payment_loan->ref = $data['ref'];
- print $payment_loan->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+ print $payment_loan->getNomUrl(1, 0, 0, '', 0);
} else {
print $data['ref'];
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 77dbd177cbd..59c293e6386 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -916,11 +916,13 @@ class Don extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param int $notooltip 1=Disable tooltip
- * @return string Chaine avec URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $notooltip 1=Disable tooltip
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string Chaine avec URL
*/
- public function getNomUrl($withpicto = 0, $notooltip = 0)
+ public function getNomUrl($withpicto = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
{
global $conf, $langs;
@@ -928,10 +930,18 @@ class Don extends CommonObject
$result = '';
$label = ''.$langs->trans("Donation").'';
- if (!empty($this->id))
+ if (!empty($this->id)) {
$label .= '
'.$langs->trans('Ref').': '.$this->id;
+ }
+ if ($moretitle) $label .= ' - '.$moretitle;
- $linkstart = '';
+ $url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
+
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+ $linkstart = '';
$linkend = '';
$result .= $linkstart;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 485d48dc443..ce152317710 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -507,25 +507,39 @@ class PaymentLoan extends CommonObject
/**
* Return clicable name (with eventually a picto)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=No picto
- * @param int $maxlen Max length label
- * @return string Chaine with URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=No picto
+ * @param int $maxlen Max length label
+ * @param int $notooltip 1=Disable tooltip
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- public function getNomUrl($withpicto = 0, $maxlen = 0)
+ public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
{
- global $langs;
+ global $langs, $conf;
+
+ if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
-
- if (!empty($this->id))
- {
- $link = '';
- $linkend = '';
-
- if ($withpicto) $result .= ($link.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment').$linkend.' ');
- if ($withpicto && $withpicto != 2) $result .= ' ';
- if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+ $label = ''.$langs->trans("Loan").'';
+ if (!empty($this->id)) {
+ $label .= '
'.$langs->trans('Ref').': '.$this->id;
}
+ if ($moretitle) $label .= ' - '.$moretitle;
+
+ $url = DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id;
+
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+
+ $linkstart = '';
+ $linkend = '';
+
+ $result .= $linkstart;
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= $this->ref;
+ $result .= $linkend;
return $result;
}