diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 1cbb92f13eb..fa11cfa46e0 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -346,12 +346,12 @@ if ($_GET["action"] == 'create')
print '
';
print ''.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.' - '.$product->libelle;
- if ($ligne->description) print nl2br($ligne->description);
+ if ($ligne->desc) print nl2br($ligne->desc);
print ' | ';
}
else
- {
- print "".nl2br($ligne->description)." | \n";
+ {var_dump($ligne);
+ print "".nl2br($ligne->desc)." | \n";
}
print ''.$ligne->qty.' | ';
@@ -474,7 +474,7 @@ else
if ($expedition->id > 0)
{
- $object = $expedition->origin;
+ $typeobject = $expedition->origin;
$expedition->fetch_object();
if (strlen($expedition->tracking_number) && strlen($expedition->expedition_method_id)) {
@@ -558,7 +558,7 @@ else
if ($conf->commande->enabled)
{
$order=new Commande($db);
- $order->fetch($expedition->$object->id);
+ $order->fetch($expedition->$typeobject->id);
print $langs->trans("RefOrder").'';
print '';
print $order->getNomUrl(1,4);
|