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

Fix: Show correct information

Browse Source
This commit is contained in:
Laurent Destailleur
2010-08-26 22:33:38 +00:00
parent fe53a86868
commit f28b3f8aba
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/fourn/commande/fiche.php
View File

@@ -1013,7 +1013,7 @@ if ($id > 0 || ! empty($ref))
$product_static=new ProductFournisseur($db); $product_static=new ProductFournisseur($db);
$product_static->fetch($commandline->fk_product); $product_static->fetch($commandline->fk_product);
$text=$product_static->getNomUrl(1); $text=$product_static->getNomUrl(1,'supplier');
$text.= ' - '.$product_static->libelle; $text.= ' - '.$product_static->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($commandline->description)); $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($commandline->description));
print $html->textwithtooltip($text,$description,3,'','',$i); print $html->textwithtooltip($text,$description,3,'','',$i);
@@ -1086,22 +1086,16 @@ if ($id > 0 || ! empty($ref))
print '<a name="'.$commandline->id.'"></a>'; // ancre pour retourner sur la ligne print '<a name="'.$commandline->id.'"></a>'; // ancre pour retourner sur la ligne
if (($conf->product->enabled || $conf->service->enabled) && $commandline->fk_product > 0) if (($conf->product->enabled || $conf->service->enabled) && $commandline->fk_product > 0)
{ {
$product_static=new ProductFournisseur($db); $product_static=new ProductFournisseur($db);
$product_static->fetch($commandline->fk_product); $product_static->fetch($commandline->fk_product);
$text=$product_static->getNomUrl(1); $text=$product_static->getNomUrl(1,'supplier');
$text.= ' - '.$product_static->libelle; $text.= ' - '.$product_static->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($commandline->description)); $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($commandline->description));
print $html->textwithtooltip($text,$description,3,'','',$i); print $html->textwithtooltip($text,$description,3,'','',$i);
// Show range // Show range
print_date_range($commandline->date_start,$commandline->date_end); print_date_range($commandline->date_start,$commandline->date_end);
/* print '<br>';
print '<a href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$commandline->fk_product.'">';
print img_object($langs->trans('ShowProduct'),'product');
print ' '.$commandline->ref_fourn.'</a>';
print ' ('.$commandline->ref.')';
print ' - '.nl2br($commandline->product);
print '<br>';*/
} }
else else
{ {