From aa5b3d1465ba886b9e97822e29b43a59c3bd11dc Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 6 May 2006 10:15:19 +0000
Subject: [PATCH] =?UTF-8?q?faire=20apparaitre=20le=20nom=20de=20la=20soci?=
 =?UTF-8?q?=E9t=E9=20sur=20la=20liste=20des=20exp=E9ditions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/expedition/liste.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index dc4c56189e1..6a2749b628e 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -62,7 +62,7 @@ if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc,
 $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."commande as c";
 if ($socidp) $sql.=", ".MAIN_DB_PREFIX."commande as c";
-$sql_add = " WHERE ";
+$sql_add = " WHERE c.fk_soc = s.rowid";
 if ($socidp)
 { 
   $sql.= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = ".$socidp; 
@@ -109,7 +109,7 @@ if ($resql)
       print "<tr $bc[$var]>";
       print "<td><a href=\"fiche.php?id=$objp->rowid\">".img_object($langs->trans("ShowSending"),"sending").'</a>&nbsp;';
       print "<a href=\"fiche.php?id=$objp->rowid\">".$objp->ref."</a></td>\n";
-      print "<a href=\"..\comm\fiche.php?id=$objp->fk_soc\">".$objp->nom."</a></td>\n";
+      print '<td><a href="'.DOL_URL_ROOT.'\comm\fiche.php?id='.$objp->fk_soc.'">'.$objp->nom.'</a></td>'"\n";
       
       $now = time();
       $lim = 3600 * 24 * 15 ;