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

Code cleaner

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-05 08:41:54 +00:00
parent 759b0395be
commit 701e92bae3
4 changed files with 534 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1891,7 +1891,7 @@ 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,1,2,4,-1 fiche commande, 3 fiche compta commande
\param option Sur quoi pointe le lien: 0=fiche commande,3=fiche compta commande,4=fiche expedition commande
\return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$option=0)
@ -1902,6 +1902,7 @@ class Commande extends CommonObject
$urlOption='';
if ($option == 3) $urlOption = '/compta';
if ($option == 4) $urlOption = '/expedition';
$lien = '<a href="'.DOL_URL_ROOT.$urlOption.'/commande/fiche.php?id='.$this->id.'">';
$lienfin='</a>';

13
htdocs/expedition/fiche.php
View File

@ -533,15 +533,22 @@ else
print '<tr><td>';
if ($conf->commande->enabled)
{
$order=new Commande($db);
$order->fetch($expedition->$object->id);
print $langs->trans("RefOrder").'</td>';
print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$expedition->$object->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$expedition->$object->ref;
print '<td colspan="3">';
print $order->getNomUrl(1,4);
print "</td>\n";
}
else
{
$propal=new Propal($db);
$propal->fetch($livraison->origin_id);
print $langs->trans("RefProposal").'</td>';
print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/expedition/propal.php?propalid='.$expedition->$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$expedition->$object->ref;
print '<td colspan="3">';
print $propal->getNomUrl(1,'expedition');
print "</td>\n";
}
print "</a></td>\n";
print '</tr>';
// Ref client

1025
htdocs/livraison/fiche.php
View File

File diff suppressed because it is too large Load Diff

6
htdocs/propal.class.php
View File

@ -1890,7 +1890,11 @@ class Propal extends CommonObject
{
$lien = '<a href="'.DOL_URL_ROOT.'/compta/propal.php?propalid='.$this->id. $get_params .'">';
}
$lienfin='</a>';
if($option == 'expedition')
{
$lien = '<a href="'.DOL_URL_ROOT.'/expedition/propal.php?propalid='.$this->id. $get_params .'">';
}
$lienfin='</a>';
$picto='order';
$label=$langs->trans("ShowPropal").': '.$this->ref;