From d69f066735eb8f056a08fdbe7c78e246f710e777 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 15 Mar 2015 14:04:07 +0100 Subject: [PATCH] QUAL: Traduce terms + remove
--- htdocs/adherents/class/adherent.class.php | 20 ++++++------- .../adherents/class/adherent_type.class.php | 12 ++++---- htdocs/adherents/class/cotisation.class.php | 12 ++++---- htdocs/admin/mailman.php | 22 +++++++-------- htdocs/admin/spip.php | 22 +++++++-------- htdocs/bookmarks/list.php | 18 ++++++------ htdocs/categories/class/categorie.class.php | 10 +++---- htdocs/comm/action/class/actioncomm.class.php | 12 ++++---- .../class/askpricesupplier.class.php | 10 +++---- htdocs/comm/propal/class/propal.class.php | 14 +++++----- htdocs/commande/customer.php | 10 +++---- htdocs/compta/bank/annuel.php | 4 +-- htdocs/compta/bank/class/account.class.php | 28 +++++++++---------- htdocs/compta/bank/graph.php | 8 +++--- .../deplacement/class/deplacement.class.php | 10 +++---- htdocs/compta/dons/class/don.class.php | 10 +++---- .../facture/class/facture-rec.class.php | 12 ++++---- .../compta/localtax/class/localtax.class.php | 8 +++--- .../cheque/class/remisecheque.class.php | 12 ++++---- .../compta/paiement/class/paiement.class.php | 12 ++++---- .../class/bonprelevement.class.php | 12 ++++---- .../salaries/class/paymentsalary.class.php | 8 +++--- .../sociales/class/chargesociales.class.php | 12 ++++---- .../class/paymentsocialcontribution.class.php | 12 ++++---- htdocs/compta/tva/class/tva.class.php | 8 +++--- htdocs/contact/class/contact.class.php | 12 ++++---- htdocs/contrat/card.php | 2 +- htdocs/contrat/class/contrat.class.php | 24 ++++++++-------- htdocs/core/class/discount.class.php | 12 ++++---- htdocs/core/tpl/login.tpl.php | 4 +-- htdocs/core/tpl/passwordforgotten.tpl.php | 4 +-- htdocs/ecm/class/ecmdirectory.class.php | 16 +++++------ .../class/expensereport.class.php | 10 +++---- htdocs/fichinter/class/fichinter.class.php | 8 +++--- .../class/fournisseur.commande.class.php | 12 ++++---- .../fourn/class/fournisseur.facture.class.php | 16 +++++------ htdocs/fourn/class/paiementfourn.class.php | 12 ++++---- htdocs/holiday/class/holiday.class.php | 8 +++--- htdocs/livraison/class/livraison.class.php | 12 ++++---- htdocs/product/class/product.class.php | 24 ++++++++-------- htdocs/product/expression.php | 4 +-- htdocs/product/stock/class/entrepot.class.php | 8 +++--- htdocs/projet/class/project.class.php | 20 ++++++------- htdocs/projet/class/task.class.php | 12 ++++---- htdocs/resource/class/resource.class.php | 8 +++--- htdocs/societe/class/address.class.php | 8 +++--- htdocs/societe/class/societe.class.php | 28 +++++++++---------- htdocs/user/class/user.class.php | 28 +++++++++---------- 48 files changed, 305 insertions(+), 305 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 78195bfa868..c8c4f9b9ad4 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1548,9 +1548,9 @@ class Adherent extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen length max libelle * @param string $option Page lien * @return string Chaine avec URL @@ -1568,25 +1568,25 @@ class Adherent extends CommonObject if ($option == 'card') { - $lien = ''; } if ($option == 'subscription') { - $lien = ''; } if ($option == 'category') { - $lien = 'ref,$maxlen):$this->ref).$lienfin; + $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; } diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 5fc2d7c4bd8..cbf5b428cc0 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -266,9 +266,9 @@ class AdherentType extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen length max libelle * @return string String with URL */ @@ -279,14 +279,14 @@ class AdherentType extends CommonObject $result=''; $label=$langs->trans("ShowTypeCard",$this->libelle); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='group'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin; + $result.=$link.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$linkend; return $result; } diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index c7faf97e748..2e1966c371e 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -254,9 +254,9 @@ class Cotisation extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -266,14 +266,14 @@ class Cotisation extends CommonObject $result=''; $label=$langs->trans("ShowSubscription").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index 3e4a2c14a98..384400b8597 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -162,11 +162,11 @@ $var=true; if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { - //$lien=img_picto($langs->trans("Active"),'tick').' '; - $lien=''; - //$lien.=$langs->trans("Disable"); - $lien.=img_picto($langs->trans("Activated"),'switch_on'); - $lien.=''; + //$link=img_picto($langs->trans("Active"),'tick').' '; + $link=''; + //$link.=$langs->trans("Disable"); + $link.=img_picto($langs->trans("Activated"),'switch_on'); + $link.=''; // Edition des varibales globales $constantes=array( 'ADHERENT_MAILMAN_ADMINPW', @@ -175,7 +175,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) 'ADHERENT_MAILMAN_LISTS' ); - print_fiche_titre($langs->trans('MailmanTitle'), $lien,''); + print_fiche_titre($langs->trans('MailmanTitle'), $link,''); print '
'; @@ -207,11 +207,11 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) } else { - $lien=''; - //$lien.=img_$langs->trans("Activate") - $lien.=img_picto($langs->trans("Disabled"),'switch_off'); - $lien.=''; - print_fiche_titre($langs->trans('MailmanTitle'), $lien,''); + $link=''; + //$link.=img_$langs->trans("Activate") + $link.=img_picto($langs->trans("Disabled"),'switch_off'); + $link.=''; + print_fiche_titre($langs->trans('MailmanTitle'), $link,''); } dol_fiche_end(); diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index 9c81338562e..76f66d4e96b 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -124,11 +124,11 @@ $var=true; */ if (! empty($conf->global->ADHERENT_USE_SPIP)) { - //$lien=img_picto($langs->trans("Active"),'tick').' '; - $lien=''; - //$lien.=$langs->trans("Disable"); - $lien.=img_picto($langs->trans("Activated"),'switch_on'); - $lien.=''; + //$link=img_picto($langs->trans("Active"),'tick').' '; + $link=''; + //$link.=$langs->trans("Disable"); + $link.=img_picto($langs->trans("Activated"),'switch_on'); + $link.=''; // Edition des varibales globales $constantes=array( 'ADHERENT_SPIP_SERVEUR', @@ -137,18 +137,18 @@ if (! empty($conf->global->ADHERENT_USE_SPIP)) 'ADHERENT_SPIP_PASS' ); - print_fiche_titre($langs->trans('SPIPTitle'), $lien, ''); + print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); print '
'; form_constantes($constantes); print '
'; } else { - $lien=''; - //$lien.=$langs->trans("Activate"); - $lien.=img_picto($langs->trans("Disabled"),'switch_off'); - $lien.=''; - print_fiche_titre($langs->trans('SPIPTitle'), $lien, ''); + $link=''; + //$link.=$langs->trans("Activate"); + $link.=img_picto($langs->trans("Disabled"),'switch_off'); + $link.=''; + print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index e00772a0af5..be821f72af9 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -119,17 +119,17 @@ if ($resql) print "bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid.""; print ''; - $lieninterne=0; + $linkintern=0; $title=dol_trunc($obj->title,24); - $lien=dol_trunc($obj->url,24); + $link=dol_trunc($obj->url,24); // Title print ""; if ($obj->rowid) { // Lien interne societe - $lieninterne=1; - $lien="Dolibarr"; + $linkintern=1; + $link="Dolibarr"; if (! $obj->title) { // For compatibility with old Dolibarr bookmarks @@ -140,16 +140,16 @@ if ($resql) } $title=img_object($langs->trans("ShowCompany"),"company").' '.$obj->title; } - if ($lieninterne) print "url."\">"; + if ($linkintern) print "url."\">"; print $title; - if ($lieninterne) print ""; + if ($linkintern) print ""; print "\n"; // Url print ""; - if (! $lieninterne) print 'target?' target="newlink"':'').'>'; - print $lien; - if (! $lieninterne) print ''; + if (! $linkintern) print 'target?' target="newlink"':'').'>'; + print $link; + if (! $linkintern) print ''; print "\n"; // Target diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 7f75e6f580b..9a76211b828 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1265,7 +1265,7 @@ class Categorie extends CommonObject /** * Return name and link of category (with picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien ('', 'xyz') * @param int $maxlength Max length of text * @return string Chaine avec URL @@ -1277,15 +1277,15 @@ class Categorie extends CommonObject $result=''; $label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='category'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin; + if ($withpicto != 2) $result.=$link.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$linkend; return $result; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 5be0df34371..37758eea2ab 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -957,7 +957,7 @@ class ActionComm extends CommonObject * Return URL of event * Use $this->id, $this->type_code, $this->label and $this->type_label * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Nombre de caracteres max dans libelle * @param string $classname Force style class on a link * @param string $option ''=Link to action,'birthday'=Link to contact @@ -974,9 +974,9 @@ class ActionComm extends CommonObject $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; - if ($option=='birthday') $lien = '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; + $result.=$link.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$linkend; } if ($withpicto==1) $result.=' '; - $result.=$lien.$libelleshort.$lienfin; + $result.=$link.$libelleshort.$linkend; return $result; } diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index 8740e139235..ee0ad10d2e3 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -2240,21 +2240,21 @@ class AskPriceSupplier extends CommonObject $label=$langs->trans("ShowAskpricesupplier").': '.$this->ref; $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option == '') { - $lien = 'ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b0997cb9943..8909441b9c1 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2658,27 +2658,27 @@ class Propal extends CommonObject $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option == '') { - $lien = 'ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 333ce5f7908..e4662cc7ee8 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -158,12 +158,12 @@ if ($resql) print ''; $result=''; - $lien=$lienfin=''; - $lien = ''; - $lienfin=''; + $link=$linkend=''; + $link = ''; + $linkend=''; $name=$obj->name; - $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); - $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin; + $result.=($link.img_object($langs->trans("ShowCompany").': '.$name,'company').$linkend); + $result.=$link.(dol_trunc($name,$maxlen)).$linkend; print $result; print ''; diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index e5bafe8fed6..0a9cfc79b10 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -137,7 +137,7 @@ $head=bank_prepare_head($acct); dol_fiche_head($head,'annual',$langs->trans("FinancialAccount"),0,'account'); $title=$langs->trans("FinancialAccount")." : ".$acct->label; -$lien=($year_start?"".img_previous()." ".$langs->trans("Year")." ".img_next()."":""); +$link=($year_start?"".img_previous()." ".$langs->trans("Year")." ".img_next()."":""); print ''; @@ -191,7 +191,7 @@ print '
'; // Affiche tableau print '
'; -print ''; +print ''; print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 80262babbbf..c0704ef8f7a 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -968,9 +968,9 @@ class Account extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto Inclut le picto dans le lien + * @param int $withpicto Include picto into link * @param string $mode ''=Link to card, 'transactions'=Link to transactions card * @return string Chaine avec URL */ @@ -988,17 +988,17 @@ class Account extends CommonObject if (empty($mode)) { - $lien = ''; } else if ($mode == 'transactions') { - $lien = ''; } - if ($withpicto) $result.=($lien.img_object($label, 'account', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->label.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->label.$linkend; return $result; } @@ -1521,9 +1521,9 @@ class AccountLine extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @param string $option Option ('showall') * @return string Chaine avec URL @@ -1534,11 +1534,11 @@ class AccountLine extends CommonObject $result=''; $label=$langs->trans("ShowTransaction").': '.$this->rowid; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'account', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->rowid.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->rowid.$linkend; if ($option == 'showall' || $option == 'showconciliated') $result.=' ('; if ($option == 'showall') diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 9351cc5fa9a..60592085b35 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -841,8 +841,8 @@ if ($mode == 'standard') if ($nextmonth > 12) { $nextmonth=1; $nextyear++; } // For month - $lien="".img_previous()." ".$langs->trans("Month")." ".img_next().""; - print ''; + $link="".img_previous()." ".$langs->trans("Month")." ".img_next().""; + print ''; print ''; + $link="".img_previous()." ".$langs->trans("Year")." ".img_next().""; + print ''; print '
'.$lien.'
'.$link.'
'.$langs->trans("Month").'
'.$lien.'
'.$link.'
'; $file = "movement".$account."-".$year.$month.".png"; @@ -855,8 +855,8 @@ if ($mode == 'standard') // For year $prevyear=$year-1;$nextyear=$year+1; - $lien="".img_previous()." ".$langs->trans("Year")." ".img_next().""; - print '
'.$lien.'
'.$link.'
'; print $show5; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 6e424d9b49c..dc2d281e2a1 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -349,7 +349,7 @@ class Deplacement extends CommonObject /** * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -359,15 +359,15 @@ class Deplacement extends CommonObject $result=''; $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='trip'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index e5d64eb0d9d..c018570a3b0 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -703,7 +703,7 @@ class Don extends CommonObject /** * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -713,15 +713,15 @@ class Don extends CommonObject $result=''; $label=$langs->trans("ShowDonation").': '.$this->id; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='generic'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->id.$lienfin; + if ($withpicto != 2) $result.=$link.$this->id.$linkend; return $result; } diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 40ab9119998..c87ddb8abfc 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -547,9 +547,9 @@ class FactureRec extends Facture } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien ('', 'withdraw') * @return string Chaine avec URL */ @@ -560,15 +560,15 @@ class FactureRec extends Facture $result=''; $label=$langs->trans("ShowInvoice").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='bill'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index c14c117bfbe..994e3cca40c 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -582,14 +582,14 @@ class Localtax extends CommonObject $result=''; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 23b19c50a6e..a3fb835f194 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -768,9 +768,9 @@ class RemiseCheque extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -781,12 +781,12 @@ class RemiseCheque extends CommonObject $result=''; $label = $langs->trans("ShowCheckReceipt").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 01b65c0dd47..883110e9d5b 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -737,9 +737,9 @@ class Paiement extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -750,12 +750,12 @@ class Paiement extends CommonObject $result=''; $label = $langs->trans("ShowPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index e977712ab39..755e88a57b8 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1113,17 +1113,17 @@ class BonPrelevement extends CommonObject $result=''; $label = $langs->trans("ShowWithdraw").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->ref.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index f566123809c..0db00c10c7f 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -490,14 +490,14 @@ class PaymentSalary extends CommonObject $result=''; $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 6f68e76303c..dc70126ab9e 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -408,9 +408,9 @@ class ChargeSociales extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ @@ -423,12 +423,12 @@ class ChargeSociales extends CommonObject if (empty($this->ref)) $this->ref=$this->lib; $label = $langs->trans("ShowSocialContribution").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; } diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index e736cb2a5a3..08f9380c905 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -576,9 +576,9 @@ class PaymentSocialContribution extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ @@ -593,12 +593,12 @@ class PaymentSocialContribution extends CommonObject if (!empty($this->id)) { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; } return $result; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index c32297a7e12..948b5096fa3 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -640,14 +640,14 @@ class Tva extends CommonObject $result=''; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 94147a2904d..19ea13f6a39 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -895,17 +895,17 @@ class Contact extends CommonObject $label = '' . $langs->trans("ShowContact") . ''; $label.= '
' . $langs->trans("Name") . ': '.$this->getFullName($langs); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($label, 'contact', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' '); + $result.=$link.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend; return $result; } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 82563549675..232df30e280 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1053,7 +1053,7 @@ if ($action == 'create') print "
\n"; - print '
'; + print '
'; if (is_object($objectsrc)) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 65db3144bb0..daac348e920 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1742,9 +1742,9 @@ class Contrat extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Max length of ref * @return string Chaine avec URL */ @@ -1755,15 +1755,15 @@ class Contrat extends CommonObject $result=''; $label=$langs->trans("ShowContract").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='contract'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$linkend; return $result; } @@ -2290,9 +2290,9 @@ class ContratLigne extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Max length * @return string Chaine avec URL */ @@ -2303,15 +2303,15 @@ class ContratLigne extends CommonObject $result=''; $label=$langs->trans("ShowContractOfService").': '.$this->label; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='contract'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->label.$lienfin; + if ($withpicto != 2) $result.=$link.$this->label.$linkend; return $result; } diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index a8862ab5ed2..3542b8eb1a9 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -435,23 +435,23 @@ class DiscountAbsolute if ($option == 'invoice') { $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $ref=$this->ref_facture_source; $picto='bill'; } if ($option == 'discount') { $label=$langs->trans("Discount"); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $ref=$langs->trans("Discount"); $picto='generic'; } - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$ref.$lienfin; + $result.=$link.$ref.$linkend; return $result; } diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index bf5456a7d8d..be422c218e2 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -46,7 +46,7 @@ $(document).ready(function () { -
+
-
+ diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index c517ec611d1..662bf997aa9 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -44,7 +44,7 @@ $(document).ready(function () { -
+
-
+ diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 63fe3d477e4..99b1441e658 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -400,7 +400,7 @@ class EcmDirectory // extends CommonObject /** * Return directory name you can click (and picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=Pas de picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @param int $max Max length * @param string $more Add more param on a link @@ -416,19 +416,19 @@ class EcmDirectory // extends CommonObject $newlabel=$langs->trans("ShowECMSection").': '.$newref; $linkclose='"'.($more?' '.$more:'').' title="'.dol_escape_htmltag($newlabel, 1).'" class="classfortooltip">'; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='trip'; $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($link.img_object($label,$picto).$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7be3b0bf3bd..51d37dcc8ae 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -551,15 +551,15 @@ class Fichinter extends CommonObject if (! empty($this->ref)) $label .= '
' . $langs->trans('Ref') . ': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='intervention'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b9477d0adc8..8b7d81fdda0 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -547,9 +547,9 @@ class CommandeFournisseur extends CommonOrder /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -570,14 +570,14 @@ class CommandeFournisseur extends CommonOrder if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='order'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 98d49fa5ff3..9cc6b237c41 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1513,9 +1513,9 @@ class FactureFournisseur extends CommonInvoice /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @param int $max Max length of shown ref * @return string Chaine avec URL @@ -1539,20 +1539,20 @@ class FactureFournisseur extends CommonInvoice if ($option == 'document') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } else { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } $ref=$this->ref; if (empty($ref)) $ref=$this->id; - if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' '); + $result.=$link.($max?dol_trunc($ref,$max):$ref).$linkend; return $result; } diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 3cd3ec0496c..dc66e5abf9a 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -476,9 +476,9 @@ class PaiementFourn extends Paiement /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -495,13 +495,13 @@ class PaiementFourn extends Paiement } $label = $langs->trans("ShowPayment").': '.$text; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$text.$lienfin; + if ($withpicto != 2) $result.=$link.$text.$linkend; return $result; } } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 280efd4addc..f9624946531 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -660,14 +660,14 @@ class Holiday extends CommonObject $result=''; $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='holiday'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index f1e9e3d6ca6..027f7ab3b89 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -668,9 +668,9 @@ class Livraison extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -682,14 +682,14 @@ class Livraison extends CommonObject $label=$langs->trans("ShowReceiving").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='sending'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 4c341e58906..3f66a5f51fd 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2941,26 +2941,26 @@ class Product extends CommonObject $linkclose = '" title="'.str_replace('\n', '', dol_escape_htmltag($label, 1)).'" class="classfortooltip">'; if ($option == 'supplier') { - $lien = ''; } else if ($option == 'stock') { - $lien = ''; } else if ($option == 'composition') { - $lien = ''; } else if ($option == 'category') { - $lien = ''; + $link = 'label, 'product', 'class="classfortooltip"').$lienfin.' '); - if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$lienfin.' '); + if ($this->type == 0) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' '); + if ($this->type == 1) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' '); } - $result.=$lien.$newref.$lienfin; + $result.=$link.$newref.$linkend; return $result; } diff --git a/htdocs/product/expression.php b/htdocs/product/expression.php index be3e5401789..cb612359bd5 100644 --- a/htdocs/product/expression.php +++ b/htdocs/product/expression.php @@ -194,7 +194,7 @@ print ''; print ''; //Buttons -print '
'; +print '
'; print ''; print ''.$langs->trans("Back").''; if ($eid == 0) @@ -205,7 +205,7 @@ else { print '
'.$langs->trans("Delete").'
'; } -print '
'; +print ''; print ''; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 09c7c21a0d5..271da598b6b 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -518,11 +518,11 @@ class Entrepot extends CommonObject if (! empty($this->lieu)) $label.= '
' . $langs->trans('LocationSummary').': '.$this->lieu; - $lien=''; - $lienfin=''; + $link=''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'stock', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->libelle.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'stock', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->libelle.$linkend; return $result; } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index bc9e6bd37b5..0cb72355bb0 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -810,9 +810,9 @@ class Project extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Variant ('', 'nolink') * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string * @return string Chaine avec URL @@ -822,8 +822,8 @@ class Project extends CommonObject global $langs; $result = ''; - $lien = ''; - $lienfin = ''; + $link = ''; + $linkend = ''; $label = '' . $langs->trans("ShowProject") . ''; if (! empty($this->ref)) $label .= '
' . $langs->trans('Ref') . ': ' . $this->ref; @@ -833,11 +833,11 @@ class Project extends CommonObject if ($option != 'nolink') { if (preg_match('/\.php$/',$option)) { - $lien = ''; } else { - $lien = ''; } } @@ -845,9 +845,9 @@ class Project extends CommonObject if (!$this->public) $picto = 'project'; - if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin); + if ($withpicto) $result.=($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); + if ($withpicto != 2) $result.=$link . $this->ref . $linkend . (($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 c322e0be3cc..84888484d2c 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -494,9 +494,9 @@ class Task extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $option Sur quoi pointe le lien * @param int $mode Mode 'task', 'time', 'contact', 'note', document' define page to link to. * @return string Chaine avec URL @@ -517,15 +517,15 @@ class Task extends CommonObject } $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; - $lien = 'ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 498291c1cc1..33df80fc095 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -873,18 +873,18 @@ class Resource extends CommonObject if ($option == '') { - $lien = ''; + $link = ''; $picto='resource@resource'; $label=$langs->trans("ShowResource").': '.$this->ref; } - $lienfin=''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } } diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 68f58e41c34..db981834760 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -430,11 +430,11 @@ class Address $result=''; $label = $langs->trans("ShowAddress").': '.$this->label; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->label.$lienfin; + if ($withpicto) $result.=($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->label.$linkend; return $result; } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index ee81df97889..9af32e0756f 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1751,41 +1751,41 @@ class Societe extends CommonObject } $result=''; $label=''; - $lien=''; $lienfin=''; + $link=''; $linkend=''; $label.= '
'; if ($option == 'customer' || $option == 'compta') { $label.= '' . $langs->trans("ShowCustomer") . ''; - $lien = 'global->SOCIETE_DISABLE_PROSPECTS)) { $label.= '' . $langs->trans("ShowProspect") . ''; - $lien = 'trans("ShowSupplier") . ''; - $lien = 'trans("ShowCategory") . ''; - $lien = 'trans("ShowCategorySupplier") . ''; - $lien = 'trans("ShowCompany") . ''; - $lien = ''; // Add type of canvas - $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"'; - $lien.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"'); - $lien.='>'; - $lienfin=''; + $link.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"'; + $link.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"'); + $link.='>'; + $linkend=''; - if ($withpicto) $result.=($lien.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"')).$lienfin); + if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"')).$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin; + $result.=$link.($maxlen?dol_trunc($name,$maxlen):$name).$linkend; return $result; } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index babac9c33ba..4ced71a7022 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1775,7 +1775,7 @@ class User extends CommonObject * Return a link to the user card (with optionaly the picto) * Use this->id,this->lastname, this->firstname * - * @param int $withpicto Include picto in link (0=No picto, 1=Inclut le picto dans le lien, 2=Picto seul) + * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param string $option On what the link point to * @param boolean $infologin Add connection info to the tooltip * @param string $notooltip 1=Disable tooltip @@ -1836,24 +1836,24 @@ class User extends CommonObject } - $lien = 'getFullName($langs,'','',$maxlen) . $companylink . $lienfin; + $result.= $link . $this->getFullName($langs,'','',$maxlen) . $companylink . $linkend; return $result; } /** * Renvoie login clicable (avec eventuellement le picto) * - * @param int $withpicto Inclut le picto dans le lien + * @param int $withpicto Include picto into link * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -1863,17 +1863,17 @@ class User extends CommonObject $result=''; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin.' '); - $result.=$lien.$this->login.$lienfin; + if ($withpicto) $result.=($link.img_object($langs->trans("ShowUser"),'user').$linkend.' '); + $result.=$link.$this->login.$linkend; return $result; }