diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 8c8c2d604ca..b7c65c3bbeb 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1572,14 +1572,14 @@ class Adherent extends CommonObject
}
if ($option == 'category')
{
- $lien = '';
- $lienfin='';
+ $lien = '';
+ $lienfin='';
}
$picto='user';
$label=$langs->trans("ShowMember");
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
return $result;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 2d5f3d835be..17f61bb27ba 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -277,7 +277,7 @@ class AdherentType extends CommonObject
$picto='group';
$label=$langs->trans("ShowTypeCard",$this->libelle);
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin;
return $result;
diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php
index 5193a729970..660be1f397a 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -271,7 +271,7 @@ class Cotisation extends CommonObject
$picto='payment';
$label=$langs->trans("ShowSubscription");
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index de8d494f9fc..31b08437aef 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1282,7 +1282,7 @@ class Categorie extends CommonObject
$picto='category';
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin;
return $result;
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 15394c81a3a..6a7d5f111da 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -883,23 +883,23 @@ class ActionComm extends CommonObject
if ($withpicto == 2)
{
$libelle=$label;
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
$libelleshort='';
}
else
{
- $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:''));
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
- $libelleshort=dol_trunc($libelle,$maxlength);
+ $libelle=(empty($this->libelle)?$label:$this->libelle.(($label && $label != $this->libelle)?' '.$label:''));
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle=($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code)?$langs->transnoentities("Action".$this->type_code):$this->type_label;
+ $libelleshort=dol_trunc($libelle,$maxlength);
}
if ($withpicto)
{
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // Add code into ()
- {
- $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
- }
- $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin;
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // Add code into ()
+ {
+ $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
+ }
+ $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$lienfin;
}
if ($withpicto==1) $result.=' ';
$result.=$lien.$libelleshort.$lienfin;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4b4db757dc2..636c8c5c737 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
if (! $user->rights->societe->lire) accessforbidden();
@@ -62,6 +63,7 @@ $form = new Form($db);
$formfile = new FormFile($db);
$companystatic=new Societe($db);
if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db);
+if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
llxHeader();
@@ -234,7 +236,11 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
{
$var=!$var;
$obj = $db->fetch_object($resql);
- print '
| '.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.' | ';
+ print '
| ';
+ $orderstatic->id=$obj->rowid;
+ $orderstatic->ref=$obj->ref;
+ print $orderstatic->getNomUrl(1);
+ print ' | ';
print '';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
@@ -514,7 +520,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print " | ";
- print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).' | '."\n";
+ print '';
+ $companystatic->id=$obj->rowid;
+ $companystatic->name=$obj->name;
+ $companystatic->client=$obj->client;
+ $companystatic->canvas=$obj->canvas;
+ print $companystatic->getNomUrl(1, 'company', 44);
+ print ' | ';
print '';
print dol_print_date($db->jdate($obj->dp),'day').' | '."\n";
print ''.price($obj->total_ttc).' | ';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 589afedd00c..724a3ebe45c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2629,7 +2629,7 @@ class Propal extends CommonObject
$picto='propal';
$label=$langs->trans("ShowPropal").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 06f381a41a9..95e330cd4e6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2763,7 +2763,7 @@ class Commande extends CommonOrder
$picto='order';
$label=$langs->trans("ShowOrder").': '.$this->ref;
- if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend);
+ if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$linkstart.$this->ref.$linkend;
return $result;
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 4343e2cb921..45b049e599b 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -890,7 +890,7 @@ class Account extends CommonObject
$lienfin='';
}
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount"),'account').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount").': '.$this->label, 'account', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.$this->label.$lienfin;
return $result;
}
@@ -1430,7 +1430,7 @@ class AccountLine extends CommonObject
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"),'account').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"), 'account', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.$this->rowid.$lienfin;
if ($option == 'showall' || $option == 'showconciliated') $result.=' (';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index eba7ea9d67b..534a9bb0e95 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -228,35 +228,38 @@ if ($resql)
print '';
print "
\n";
- // Loop on each record
- $total_debit=0;
- $total_credit=0;
- while ($i < min($num,$limit))
- {
- $objp = $db->fetch_object($resql);
- $printline=false;
- //Search Description
- if ($description) {
- preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthee on tente recherche de traduction
- if ($reg[1]) {
- if ($langs->transnoentities($reg[1])==$description) {
- $printline=true;
- }
- }elseif ($objp->label==$description) {$printline=true;}
- }else {$printline=true;}
+ // Loop on each record
+ $total_debit=0;
+ $total_credit=0;
+ while ($i < min($num,$limit)) {
+ $objp = $db->fetch_object($resql);
+ $printline=false;
+ //Search Description
+ if ($description) {
+ preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthese on tente recherche de traduction
+ if ($reg[1]) {
+ if ($langs->transnoentities($reg[1])==$description) {
+ $printline=true;
+ }
+ } elseif ($objp->label==$description) {
+ $printline=true;
+ }
+ } else {
+ $printline=true;
+ }
- if ($printline) {
- $var=!$var;
+ if ($printline) {
+ $var=!$var;
- print "";
+ print "
";
- // Ref
- print '| ';
- print "rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid." ";
- print ' | ';
+ // Ref
+ print '';
+ print "rowid.'">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'payment', 'class="classfortooltip"').' '.$objp->rowid." ";
+ print ' | ';
- // Date ope
- print ''.dol_print_date($db->jdate($objp->do),"day")." | \n";
+ // Date ope
+ print ''.dol_print_date($db->jdate($objp->do),"day")." | \n";
// Date value
print ''.dol_print_date($db->jdate($objp->dv),"day")." | \n";
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 4eab354577a..bb0e7d3506b 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -365,7 +365,7 @@ class Deplacement extends CommonObject
$label=$langs->trans("Show").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 61e1b9cd926..4d7c8931e31 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -719,7 +719,7 @@ class Don extends CommonObject
$label=$langs->trans("ShowDonation").': '.$this->id;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->id.$lienfin;
return $result;
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f6c0ab1a481..71634aaa3ad 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -566,7 +566,7 @@ class FactureRec extends Facture
$label=$langs->trans("ShowInvoice").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index f81fb37849f..f4699debd52 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -832,7 +832,7 @@ class Facture extends CommonInvoice
$linkstart='';
$linkend='';
- if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label),$picto).$linkend);
+ if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label), $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
return $result;
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index e2c9c94595a..85da8e05476 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -592,7 +592,7 @@ class Localtax extends CommonObject
$picto='payment';
$label=$langs->trans("ShowVatPayment").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 922ab54ac7c..9db0591ee33 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -773,7 +773,7 @@ class RemiseCheque extends CommonObject
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin);
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"), 'payment', 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 95503db6ff9..04a1f9c4f60 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -750,7 +750,7 @@ class Paiement extends CommonObject
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 497d690072b..d88bc8da8ac 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1134,7 +1134,7 @@ class BonPrelevement extends CommonObject
$lienfin='';
}
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"),'payment').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"), 'payment', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.$this->ref.$lienfin;
return $result;
}
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index 5e60b76ee13..635ed77541f 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -493,7 +493,7 @@ class PaymentSalary extends CommonObject
$picto='payment';
$label=$langs->trans("ShowSalaryPayment").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 1d684c65552..4e7211c75b1 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -424,7 +424,7 @@ class ChargeSociales extends CommonObject
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib, 'bill', 'class="classfortooltip"').$lienfin.' ');
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
return $result;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 395932de69f..a94afc98f6e 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -591,7 +591,7 @@ class PaymentSocialContribution extends CommonObject
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment', 'class="classfortooltip"').$lienfin.' ');
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
}
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index a300579fc1f..96db35f915b 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -645,7 +645,7 @@ class Tva extends CommonObject
$picto='payment';
$label=$langs->trans("ShowVatPayment").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index cbb7ee94823..cbc813968d1 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -897,7 +897,7 @@ class Contact extends CommonObject
$lienfin='';
}
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs),'contact').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs), 'contact', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$lienfin;
return $result;
}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index fac549515fc..4cb2f9ec7d1 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1555,7 +1555,7 @@ class Contrat extends CommonObject
$label=$langs->trans("ShowContract").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$lienfin;
return $result;
@@ -2071,7 +2071,7 @@ class ContratLigne extends CommonObject
$label=$langs->trans("ShowContractOfService").': '.$this->label;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->label.$lienfin;
return $result;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index f0291c9d567..98b1309149e 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -451,7 +451,7 @@ class DiscountAbsolute
}
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$ref.$lienfin;
return $result;
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 6c0de13d15b..a4379250914 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -428,7 +428,7 @@ class EcmDirectory // extends CommonObject
$newref=$this->ref;
$newlabel=$langs->trans("ShowECMSection").': '.$newref;
- if ($withpicto) $result.=($lien.img_object($newlabel,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($newlabel, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($max?dol_trunc($newref,$max,'middle'):$newref).$lienfin;
return $result;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index f9484c1175e..46f2cbc70fe 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1219,7 +1219,7 @@ class Expedition extends CommonObject
$picto='sending';
$label=$langs->trans("ShowSending").': '.$this->ref;
- if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend);
+ if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$linkstart.$this->ref.$linkend;
return $result;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index fbd5261a55f..b7887c25278 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -555,7 +555,7 @@ class Fichinter extends CommonObject
$label=$langs->trans("Show").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4fe4675f5d8..3ac895f2764 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -538,7 +538,7 @@ class CommandeFournisseur extends CommonOrder
$picto='order';
$label=$langs->trans("ShowOrder").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d9a4469481f..b931b566a61 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1489,7 +1489,7 @@ class FactureFournisseur extends CommonInvoice
$ref=$this->ref;
if (empty($ref)) $ref=$this->id;
- if ($withpicto) $result.=($lien.img_object($label,'bill').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin;
return $result;
}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 59dc5dab3d1..5c578938ae9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -499,7 +499,7 @@ class PaiementFourn extends Paiement
$text=$langs->trans($reg[1]);
}
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$text.$lienfin;
return $result;
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2ecf8edfce3..1a3e9f7ecd3 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -655,21 +655,21 @@ class Holiday extends CommonObject
*/
function getNomUrl($withpicto=0)
{
- global $langs;
+ global $langs;
- $result='';
+ $result='';
- $lien = '';
- $lienfin='';
+ $lien = '';
+ $lienfin='';
- $picto='holiday';
+ $picto='holiday';
- $label=$langs->trans("Show").': '.$this->ref;
+ $label=$langs->trans("Show").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
- if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
- return $result;
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
+ if ($withpicto && $withpicto != 2) $result.=' ';
+ if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
+ return $result;
}
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 05156a723ad..10a5f5b3c14 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -8,6 +8,7 @@ FinancialAccount=Account
FinancialAccounts=Accounts
BankAccount=Bank account
BankAccounts=Bank accounts
+ShowAccount=Show Account
AccountRef=Financial account ref
AccountLabel=Financial account label
CashAccount=Cash account
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e95fac9f639..dfad1c7e7b8 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -668,7 +668,7 @@ class Livraison extends CommonObject
$picto='sending';
$label=$langs->trans("ShowReceiving").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d739f72afc4..294c8d1610e 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2841,8 +2841,8 @@ class Product extends CommonObject
if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
if ($withpicto) {
- if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label,'product').$lienfin.' ');
- if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label,'service').$lienfin.' ');
+ if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$lienfin.' ');
+ if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$lienfin.' ');
}
$result.=$lien.$newref.$lienfin;
return $result;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 3bf672f29a3..c0627015be3 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -516,7 +516,7 @@ class Entrepot extends CommonObject
$lien='';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"), 'stock', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.$this->libelle.$lienfin;
return $result;
}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c9d4ed9f546..5bf17d596a4 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -809,7 +809,7 @@ class Project extends CommonObject
$label = $langs->trans("ShowProject") . ': ' . $this->ref . ($this->title ? ' - ' . $this->title : '');
- if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin);
+ if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
return $result;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0f9645fe237..786caafb7ec 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -513,7 +513,7 @@ class Task extends CommonObject
$label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:'');
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index c75f37b00c2..983ff501b1f 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -878,7 +878,7 @@ class Resource extends CommonObject
$label=$langs->trans("ShowResource").': '.$this->ref;
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
return $result;
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 7b36423cb61..55511922385 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -426,7 +426,7 @@ class Address
$lien = '';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' ');
$result.=$lien.$this->label.$lienfin;
return $result;
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 430d929320f..8f2e64874c6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1752,7 +1752,7 @@ class Societe extends CommonObject
$lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">';
$lienfin='';
- if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name, 'company', 'class="classfortooltip"').$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 837be155929..b1ba3b08438 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1792,7 +1792,7 @@ class User extends CommonObject
if ($withpicto)
{
- $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin);
+ $result.=($lien.img_object($langs->trans("ShowUser"), 'user', 'class="classfortooltip"').$lienfin);
if ($withpicto != 2) $result.=' ';
}
$result.=$lien.$this->getFullName($langs,'','',24).$lienfin;