diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index b7c65c3bbeb..7c65e1a5cb1 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1559,25 +1559,26 @@ class Adherent extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowMember").': '.$this->ref; + $linkclose = '" title="'.$label.'" class="classfortooltip">'; if ($option == 'card') { - $lien = ''; + $lien = ''; + $lien = ''; + $lien = 'trans("ShowTypeCard",$this->libelle); - $lien = ''; + $lien = ''; $lienfin=''; $picto='group'; - $label=$langs->trans("ShowTypeCard",$this->libelle); if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 660be1f397a..48970abace4 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -264,12 +264,12 @@ class Cotisation extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowSubscription").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; - $label=$langs->trans("ShowSubscription"); if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 31b08437aef..7e29f6ccf38 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1274,9 +1274,9 @@ class Categorie extends CommonObject global $langs; $result=''; - - $lien = ''; $label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label); + + $lien = ''; $lienfin=''; $picto='category'; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 7c828f4fa59..25a9803e63e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -897,11 +897,12 @@ class ActionComm extends CommonObject global $conf,$langs; $result=''; - if ($option=='birthday') $lien = ''; - else $lien = ''; - $lienfin=''; $label=$this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility + $linkclose = '" title="'.$label.'" class="classfortooltip">'; + if ($option=='birthday') $lien = ''; + $label=$langs->trans("ShowPropal").': '.$this->ref; + $linkclose = '" title="'.$label.'" class="classfortooltip">'; + if ($option == '') { + $lien = ''; + if ($option == 'compta') { // deprecated + $lien = ''; + if ($option == 'expedition') { + $lien = ''; + if ($option == 'document') { + $lien = 'ref; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); - if ($withpicto && $withpicto != 2) $result.=' '; + + 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 8a7005c9fea..7e10a1e8da6 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2884,12 +2884,12 @@ class Commande extends CommonOrder if ($short) return $url; - $linkstart = ''; - $linkend=''; - $picto='order'; $label=$langs->trans("ShowOrder").': '.$this->ref; + $linkstart = ''; + $linkend=''; + if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$linkstart.$this->ref.$linkend; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 685daadc833..b2e3dc79f78 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -935,15 +935,16 @@ class Account extends CommonObject global $langs; $result=''; + $linkclose = '" title="'.$this->label.'" class="classfortooltip">'; if (empty($mode)) { - $lien = ''; + $lien = ''; + $lien = ''; + $label=$langs->trans("ShowTransaction").': '.$this->rowid; + $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowTransaction"), 'account', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, 'account', 'class="classfortooltip"').$lienfin.' '); $result.=$lien.$this->rowid.$lienfin; if ($option == 'showall' || $option == 'showconciliated') $result.=' ('; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index bb0e7d3506b..e7a3350f2f3 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -357,13 +357,13 @@ class Deplacement extends CommonObject global $langs; $result=''; + $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='trip'; - $label=$langs->trans("Show").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 4d7c8931e31..c2f800f4a13 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -711,13 +711,13 @@ class Don extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowDonation").': '.$this->id; - $lien = ''; + $lien = ''; $lienfin=''; $picto='generic'; - $label=$langs->trans("ShowDonation").': '.$this->id; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 71634aaa3ad..1a8e22a14bc 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -558,13 +558,13 @@ class FactureRec extends Facture global $langs; $result=''; + $label=$langs->trans("ShowInvoice").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='bill'; - $label=$langs->trans("ShowInvoice").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index a1fe6ee1c4d..03b927d28a3 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -865,7 +865,7 @@ class Facture extends CommonInvoice if ($this->type == self::TYPE_SITUATION) $label=$langs->transnoentitiesnoconv("ShowInvoiceSituation").': '.$this->ref; if ($moretitle) $label.=' - '.$moretitle; - $linkstart=''; + $linkstart=''; $linkend=''; if ($withpicto) $result.=($linkstart.img_object(($max?dol_trunc($label,$max):$label), $picto, 'class="classfortooltip"').$linkend); diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 85da8e05476..e6c3c6e0942 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -585,12 +585,12 @@ class Localtax extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; - $label=$langs->trans("ShowVatPayment").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 9db0591ee33..a1d3c53052c 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -769,11 +769,12 @@ class RemiseCheque extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowCheckReceipt").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"), 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($lien.img_object($label, '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 d2256926e1a..b303420dd15 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -748,8 +748,9 @@ class Paiement extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowPayment").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index db4c436dfa6..3a30cf690d3 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1118,17 +1118,18 @@ class BonPrelevement extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowWithdraw").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowWithdraw"), 'payment', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, '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 635ed77541f..1e2d437793c 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -486,12 +486,12 @@ class PaymentSalary extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; - $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 4e7211c75b1..d0fe9b11ea3 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -420,11 +420,12 @@ class ChargeSociales extends CommonObject $result=''; if (empty($this->ref)) $this->ref=$this->lib; + $label = $langs->trans("ShowSocialContribution").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib, 'bill', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, '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 a94afc98f6e..55316e15b22 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -585,13 +585,14 @@ class PaymentSocialContribution extends CommonObject $result=''; if (empty($this->ref)) $this->ref=$this->lib; + $label = $langs->trans("ShowPayment").': '.$this->ref; if (!empty($this->id)) { - $lien = ''; + $lien = ''; $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, '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 96db35f915b..4730d72e596 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -638,12 +638,12 @@ class Tva extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='payment'; - $label=$langs->trans("ShowVatPayment").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index cbc813968d1..40be02a3ef1 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -887,17 +887,18 @@ class Contact extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowContact").': '.$this->getFullName($langs); - $lien = ''; + $lien = ''; $lienfin=''; if ($option == 'xxx') { - $lien = ''; + $lien = ''; $lienfin=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowContact").': '.$this->getFullName($langs), 'contact', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, '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 1417047b269..00dce5b3336 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1682,13 +1682,13 @@ class Contrat extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowContract").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='contract'; - $label=$langs->trans("ShowContract").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; @@ -2211,13 +2211,13 @@ class ContratLigne extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowContractOfService").': '.$this->label; - $lien = ''; + $lien = ''; $lienfin=''; $picto='contract'; - $label=$langs->trans("ShowContractOfService").': '.$this->label; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index 98b1309149e..8861bf556ba 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -435,17 +435,17 @@ class DiscountAbsolute if ($option == 'invoice') { - $lien = ''; - $lienfin=''; $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source; + $lien = ''; + $lienfin=''; $ref=$this->ref_facture_source; $picto='bill'; } if ($option == 'discount') { - $lien = ''; - $lienfin=''; $label=$langs->trans("Discount"); + $lien = ''; + $lienfin=''; $ref=$langs->trans("Discount"); $picto='generic'; } diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index a4379250914..b4821dc2895 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -414,19 +414,20 @@ class EcmDirectory // extends CommonObject global $langs; $result=''; + //$newref=str_replace('_',' ',$this->ref); + $newref=$this->ref; + $newlabel=$langs->trans("ShowECMSection").': '.$newref; + $linkclose='"'.($more?' '.$more:'').' title="'.$newlabel.'" class="classfortooltip">'; - $lien = ''; - if ($option == 'index') $lien = ''; - if ($option == 'indexexpanded') $lien = ''; - if ($option == 'indexnotexpanded') $lien = ''; + $lien = 'ref); - $newref=$this->ref; - $newlabel=$langs->trans("ShowECMSection").': '.$newref; if ($withpicto) $result.=($lien.img_object($newlabel, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 74d5251a191..e0ce7ef9316 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1217,16 +1217,16 @@ class Expedition extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowSending").': '.$this->ref; $url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id; if ($short) return $url; - $linkstart = ''; + $linkstart = ''; $linkend=''; $picto='sending'; - $label=$langs->trans("ShowSending").': '.$this->ref; if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 0f91e976da8..eca71601e7d 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -547,13 +547,13 @@ class Fichinter extends CommonObject global $langs; $result=''; + $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='intervention'; - $label=$langs->trans("Show").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 77f131b912b..c2743a8e3ad 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -531,12 +531,12 @@ class CommandeFournisseur extends CommonOrder global $langs; $result=''; + $label=$langs->trans("ShowOrder").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='order'; - $label=$langs->trans("ShowOrder").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 7370bc3769a..5034204154a 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1472,19 +1472,19 @@ class FactureFournisseur extends CommonInvoice global $langs; $result=''; + $label=$langs->trans("ShowInvoice").': '.$this->ref; + if ($this->ref_supplier) $label.=' / '.$this->ref_supplier; if ($option == 'document') { - $lien = ''; + $lien = ''; $lienfin=''; } else { - $lien = ''; + $lien = ''; $lienfin=''; } - $label=$langs->trans("ShowInvoice").': '.$this->ref; - if ($this->ref_supplier) $label.=' / '.$this->ref_supplier; $ref=$this->ref; if (empty($ref)) $ref=$this->id; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 443216d899d..3c3f9abba76 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -487,17 +487,17 @@ class PaiementFourn extends Paiement global $langs; $result=''; + $text=$this->ref; // Sometimes ref contains label + if (preg_match('/^\((.*)\)$/i',$text,$reg)) { + // Label generique car entre parentheses. On l'affiche en le traduisant + if ($reg[1]=='paiement') $reg[1]='Payment'; + $text=$langs->trans($reg[1]); + } + $label = $langs->trans("ShowPayment").': '.$text; - $lien = ''; - $lienfin=''; + $lien = ''; + $lienfin=''; - $text=$this->ref; // Sometimes ref contains label - if (preg_match('/^\((.*)\)$/i',$text,$reg)) - { - // Label g诩rique car entre parenth粥s. On l'affiche en le traduisant - if ($reg[1]=='paiement') $reg[1]='Payment'; - $text=$langs->trans($reg[1]); - } if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 1a3e9f7ecd3..43c074a5781 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -658,14 +658,13 @@ class Holiday extends CommonObject global $langs; $result=''; + $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='holiday'; - $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index dfad1c7e7b8..2de166e4837 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -660,13 +660,13 @@ class Livraison extends CommonObject $result=''; $urlOption=''; + $label=$langs->trans("ShowReceiving").': '.$this->ref; - $lien = ''; + $lien = ''; $lienfin=''; $picto='sending'; - $label=$langs->trans("ShowReceiving").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 294c8d1610e..a2b34eb2862 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2812,33 +2812,27 @@ class Product extends CommonObject global $langs; $result=''; + $newref=$this->ref; + if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle'); + if ($this->type == 0) $label = $langs->trans("ShowProduct").': '.$this->ref.' '.$this->label; + if ($this->type == 1) $label = $langs->trans("ShowService").': '.$this->ref.' '.$this->label; + $linkclose = '" title="'.$label.'" class="classfortooltip">'; - if ($option == 'supplier') - { - $lien = ''; - $lienfin=''; - } - else if ($option == 'stock') - { - $lien = ''; + if ($option == 'supplier') { + $lien = ''; + } else if ($option == 'composition') { + $lien = ''; } - else if ($option == 'composition') - { - $lien = ''; - $lienfin=''; - } - else if ($option == 'category') - { - $lien = ''; - } - else - { - $lien = ''; - $lienfin=''; - } - $newref=$this->ref; - if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle'); if ($withpicto) { if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$lienfin.' '); diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index c0627015be3..a04d1c02881 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -512,11 +512,12 @@ class Entrepot extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowStock").': '.$this->libelle; - $lien=''; - $lienfin=''; + $lien=''; + $lienfin=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"), 'stock', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($lien.img_object($label, '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 4eef74b0dc1..88b71cecc19 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -789,25 +789,22 @@ class Project extends CommonObject $result = ''; $lien = ''; $lienfin = ''; + $label = $langs->trans("ShowProject") . ': ' . $this->ref . ($this->title ? ' - ' . $this->title : ''); + $linkclose = '" title="'.$label.'" class="classfortooltip">'; - if ($option != 'nolink') - { - if (preg_match('/\.php$/',$option)) - { - $lien = ''; - $lienfin = ''; - } - else - { - $lien = ''; - $lienfin = ''; - } + if ($option != 'nolink') { + if (preg_match('/\.php$/',$option)) { + $lien = ''; + } } $picto = 'projectpub'; if (!$this->public) $picto = 'project'; - $label = $langs->trans("ShowProject") . ': ' . $this->ref . ($this->title ? ' - ' . $this->title : ''); if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 786caafb7ec..497dabdc69f 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -505,13 +505,13 @@ class Task extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:''); - $lien = ''; + $lien = ''; $lienfin=''; $picto='projecttask'; - $label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:''); if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index deea00f9c99..fec44b3e2b7 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -869,10 +869,11 @@ class Resource extends CommonObject global $langs; $result=''; + $label=$langs->trans("ShowResource").': '.$this->ref; if ($option == '') { - $lien = ''; + $lien = ''; $picto='resource@resource'; $label=$langs->trans("ShowResource").': '.$this->ref; @@ -880,7 +881,6 @@ class Resource extends CommonObject $lienfin=''; - $label=$langs->trans("ShowResource").': '.$this->ref; if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); if ($withpicto && $withpicto != 2) $result.=' '; diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 55511922385..ac1e28a0657 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -422,8 +422,9 @@ class Address global $langs; $result=''; + $label = $langs->trans("ShowAddress").': '.$this->label; - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' '); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 8f2e64874c6..bcf5ae3104a 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1749,7 +1749,7 @@ class Societe extends CommonObject } // Add type of canvas - $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'">'; + $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'" title="'.$name.'" class="classfortooltip">'; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name, 'company', 'class="classfortooltip"').$lienfin); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 9ea4f3de9c5..c5733d5724f 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1786,13 +1786,13 @@ class User extends CommonObject global $langs; $result=''; + $label = $langs->trans("ShowUser").': '.$this->getFullName($langs,'','',24); - $lien = ''; + $lien = ''; $lienfin=''; - if ($withpicto) - { - $result.=($lien.img_object($langs->trans("ShowUser"), 'user', 'class="classfortooltip"').$lienfin); + if ($withpicto) { + $result.=($lien.img_object($label, 'user', 'class="classfortooltip"').$lienfin); if ($withpicto != 2) $result.=' '; } $result.=$lien.$this->getFullName($langs,'','',24).$lienfin;