From e48e9643f0c6c1464b281ec16a2da68c8fc3e8d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 11 Sep 2008 17:43:04 +0000
Subject: [PATCH] Fix: Description missing
---
htdocs/expedition/fiche.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 '<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;
- if ($ligne->description) print nl2br($ligne->description);
+ if ($ligne->desc) print nl2br($ligne->desc);
print '</td>';
}
else
- {
- print "<td>".nl2br($ligne->description)."</td>\n";
+ {var_dump($ligne);
+ print "<td>".nl2br($ligne->desc)."</td>\n";
}
print '<td align="center">'.$ligne->qty.'</td>';
@@ -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").'</td>';
print '<td colspan="3">';
print $order->getNomUrl(1,4);
--
GitLab