Fix: Bad link

This commit is contained in:
Laurent Destailleur 2010-11-04 19:05:05 +00:00
parent 6da6637c43
commit 49bd52c4ab
5 changed files with 25 additions and 25 deletions

View File

@ -2048,12 +2048,12 @@ class Propal extends CommonObject
} }
} }
/** /**
* \brief Renvoie nom clicable (avec eventuellement le picto) * Return clicable link of object (with eventually picto)
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param withpicto Add picto into link
* \param option Sur quoi pointe le lien * @param option Where point the link
* \param get_params Parametres added to url * @param get_params Parametres added to url
* \return string Chaine avec URL * @return string String with URL
*/ */
function getNomUrl($withpicto=0,$option='', $get_params='') function getNomUrl($withpicto=0,$option='', $get_params='')
{ {
@ -2064,9 +2064,9 @@ class Propal extends CommonObject
{ {
$lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$this->id. $get_params .'">'; $lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$this->id. $get_params .'">';
} }
if($option == 'compta') if($option == 'compta') // deprecated
{ {
$lien = '<a href="'.DOL_URL_ROOT.'/compta/propal.php?id='.$this->id. $get_params .'">'; $lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$this->id. $get_params .'">';
} }
if($option == 'expedition') if($option == 'expedition')
{ {

View File

@ -2171,10 +2171,10 @@ class Commande extends CommonObject
/** /**
* \brief Renvoie nom clicable (avec eventuellement le picto) * Return clicable link of object (with eventually picto)
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param withpicto Add picto into link
* \param option Sur quoi pointe le lien: 0=fiche commande,3=fiche compta commande,4=fiche expedition commande * @param option Where point the link
* \return string Chaine avec URL * @return string String with URL
*/ */
function getNomUrl($withpicto=0,$option=0) function getNomUrl($withpicto=0,$option=0)
{ {

View File

@ -564,11 +564,11 @@ class Facture extends CommonObject
} }
/** /**
* \brief Renvoie nom clicable (avec eventuellement le picto) * Return clicable link of object (with eventually picto)
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param withpicto Add picto into link
* \param option Sur quoi pointe le lien ('', 'withdraw') * @param option Where point the link
* \param max Max length of shown ref * @param max Maxlength of ref
* \return string Chaine avec URL * @return string String with URL
*/ */
function getNomUrl($withpicto=0,$option='',$max=0) function getNomUrl($withpicto=0,$option='',$max=0)
{ {

View File

@ -535,11 +535,11 @@ else
{ {
/** /**
* *
* Mode Liste des propales * Mode List
* *
*/ */
$now=gmmktime(); $now=dol_now();
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
@ -649,7 +649,7 @@ else
//Ref //Ref
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">'; print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print $propalstatic->getNomUrl(1, 'compta', "&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder"); print $propalstatic->getNomUrl(1, '', "&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder");
print '</td>'; print '</td>';
print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; print '<td width="20" class="nobordernopadding" nowrap="nowrap">';

View File

@ -2169,11 +2169,11 @@ class Product extends CommonObject
} }
/** /**
* \brief Return clicable link of object (with eventually picto) * Return clicable link of object (with eventually picto)
* \param withpicto Inclut le picto dans le lien * @param withpicto Add picto into link
* \param option Sur quoi pointe le lien * @param option Where point the link
* \param maxlength Maxlength of ref * @param maxlength Maxlength of ref
* \return string Chaine avec URL * @return string String with URL
*/ */
function getNomUrl($withpicto=0,$option='',$maxlength=0) function getNomUrl($withpicto=0,$option='',$maxlength=0)
{ {