diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index e161ed529a5..3b7125f34de 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2048,12 +2048,12 @@ class Propal extends CommonObject } } - /** - * \brief Renvoie nom clicable (avec eventuellement le picto) - * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * \param option Sur quoi pointe le lien - * \param get_params Parametres added to url - * \return string Chaine avec URL + /** + * Return clicable link of object (with eventually picto) + * @param withpicto Add picto into link + * @param option Where point the link + * @param get_params Parametres added to url + * @return string String with URL */ function getNomUrl($withpicto=0,$option='', $get_params='') { @@ -2064,9 +2064,9 @@ class Propal extends CommonObject { $lien = ''; } - if($option == 'compta') + if($option == 'compta') // deprecated { - $lien = ''; + $lien = ''; } if($option == 'expedition') { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 38af54ccd7c..401ad1eae93 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2171,10 +2171,10 @@ class Commande extends CommonObject /** - * \brief Renvoie nom clicable (avec eventuellement le picto) - * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * \param option Sur quoi pointe le lien: 0=fiche commande,3=fiche compta commande,4=fiche expedition commande - * \return string Chaine avec URL + * Return clicable link of object (with eventually picto) + * @param withpicto Add picto into link + * @param option Where point the link + * @return string String with URL */ function getNomUrl($withpicto=0,$option=0) { diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index bcc558ae8f7..0827151bb86 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -564,11 +564,11 @@ class Facture extends CommonObject } /** - * \brief Renvoie nom clicable (avec eventuellement le picto) - * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * \param option Sur quoi pointe le lien ('', 'withdraw') - * \param max Max length of shown ref - * \return string Chaine avec URL + * Return clicable link of object (with eventually picto) + * @param withpicto Add picto into link + * @param option Where point the link + * @param max Maxlength of ref + * @return string String with URL */ function getNomUrl($withpicto=0,$option='',$max=0) { diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 2791c1cf2c0..442db0a0f5b 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -535,11 +535,11 @@ else { /** * - * Mode Liste des propales + * Mode List * */ - $now=gmmktime(); + $now=dol_now(); $limit = $conf->liste_limit; $offset = $limit * $page ; @@ -649,7 +649,7 @@ else //Ref print '
| '; - print $propalstatic->getNomUrl(1, 'compta', "&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder"); + print $propalstatic->getNomUrl(1, '', "&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder"); print ' | '; print ''; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index b2c5b7febb0..418a003869d 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2169,11 +2169,11 @@ class Product extends CommonObject } /** - * \brief Return clicable link of object (with eventually picto) - * \param withpicto Inclut le picto dans le lien - * \param option Sur quoi pointe le lien - * \param maxlength Maxlength of ref - * \return string Chaine avec URL + * Return clicable link of object (with eventually picto) + * @param withpicto Add picto into link + * @param option Where point the link + * @param maxlength Maxlength of ref + * @return string String with URL */ function getNomUrl($withpicto=0,$option='',$maxlength=0) { |