lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Link was last

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-26 19:09:39 +00:00
parent 38098eab1e
commit 389f744c4e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/stock/mouvementstock.class.php
View File

@ -404,7 +404,7 @@ class MouvementStock
/** /**
* \brief Decrease stock for product and subproducts * \brief Decrease stock for product and subproducts
* * \return int <0 if KO, >0 if OK
*/ */
function livraison($user, $fk_product, $entrepot_id, $qty) function livraison($user, $fk_product, $entrepot_id, $qty)
{ {
@ -414,7 +414,7 @@ class MouvementStock
/** /**
* \brief Increase stock for product and subproducts * \brief Increase stock for product and subproducts
* * \return int <0 if KO, >0 if OK
*/ */
function reception($user, $fk_product, $entrepot_id, $qty, $price=0) function reception($user, $fk_product, $entrepot_id, $qty, $price=0)
{ {

12
htdocs/societe.class.php
View File

@ -1173,6 +1173,7 @@ class Societe extends CommonObject
global $langs; global $langs;
$result=''; $result='';
$lien=$lienfin='';
if ($option == 'customer') if ($option == 'customer')
{ {
@ -1186,11 +1187,6 @@ class Societe extends CommonObject
$lien= '<a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$this->id.'">'; $lien= '<a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$this->id.'">';
$lienfin='</a>'; $lienfin='</a>';
} }
else
{
$lien = '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$this->id.'">';
$lienfin='</a>';
}
} }
if ($option == 'supplier') if ($option == 'supplier')
{ {
@ -1203,8 +1199,14 @@ class Societe extends CommonObject
$lienfin='</a>'; $lienfin='</a>';
} }
if (empty($lien))
{
$lien = '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$this->id.'">';
$lienfin='</a>';
}
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$this->nom,'company').$lienfin.' '); if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCompany").': '.$this->nom,'company').$lienfin.' ');
$result.=$lien.($maxlen?dolibarr_trunc($this->nom,$maxlen):$this->nom).$lienfin; $result.=$lien.($maxlen?dolibarr_trunc($this->nom,$maxlen):$this->nom).$lienfin;
return $result; return $result;
} }