Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Works on paypal module

Browse Source
This commit is contained in:
Regis Houssin
2011-05-21 08:33:36 +00:00
parent a807c5b391
commit cc1646f3fd
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/commande/class/commande.class.php
View File

@@ -2469,24 +2469,27 @@ class Commande extends CommonObject
* @param option Where point the link
* @return string String with URL
*/
function getNomUrl($withpicto=0,$option=0)
function getNomUrl($withpicto=0,$option=0,$short=0)
{
global $conf, $langs;
$result='';
$urlOption = '/commande/fiche.php';
if ($conf->expedition->enabled && ($option == 1 || $option == 2)) $urlOption = '/expedition/shipment.php';
$file = '/commande/fiche.php';
if ($conf->expedition->enabled && ($option == 1 || $option == 2)) $file = '/expedition/shipment.php';
$url = DOL_URL_ROOT.$file.'?id='.$this->id;
if ($short) return $url;
$lien = '<a href="'.DOL_URL_ROOT.$urlOption.'?id='.$this->id.'">';
$lienfin='</a>';
$linkstart = '<a href="'.$url.'">';
$linkend='</a>';
$picto='order';
$label=$langs->trans("ShowOrder").': '.$this->ref;
if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
if ($withpicto) $result.=($linkstart.img_object($label,$picto).$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
$result.=$lien.$this->ref.$lienfin;
$result.=$linkstart.$this->ref.$linkend;
return $result;
}