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

Fix: Description missing

Browse Source
This commit is contained in:
Laurent Destailleur 2008-09-11 17:43:04 +00:00
parent bbbb8b983d
commit e48e9643f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/expedition/fiche.php
View File

@ -346,12 +346,12 @@ if ($_GET["action"] == 'create')
print '<td>'; print '<td>';
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$ligne->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$product->libelle; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$ligne->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$product->libelle;
if ($ligne->description) print nl2br($ligne->description); if ($ligne->desc) print nl2br($ligne->desc);
print '</td>'; print '</td>';
} }
else else
{ {var_dump($ligne);
print "<td>".nl2br($ligne->description)."</td>\n"; print "<td>".nl2br($ligne->desc)."</td>\n";
} }
print '<td align="center">'.$ligne->qty.'</td>'; print '<td align="center">'.$ligne->qty.'</td>';
@ -474,7 +474,7 @@ else
if ($expedition->id > 0) if ($expedition->id > 0)
{ {
$object = $expedition->origin; $typeobject = $expedition->origin;
$expedition->fetch_object(); $expedition->fetch_object();
if (strlen($expedition->tracking_number) && strlen($expedition->expedition_method_id)) { if (strlen($expedition->tracking_number) && strlen($expedition->expedition_method_id)) {
@ -558,7 +558,7 @@ else
if ($conf->commande->enabled) if ($conf->commande->enabled)
{ {
$order=new Commande($db); $order=new Commande($db);
$order->fetch($expedition->$object->id); $order->fetch($expedition->$typeobject->id);
print $langs->trans("RefOrder").'</td>'; print $langs->trans("RefOrder").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $order->getNomUrl(1,4); print $order->getNomUrl(1,4);