diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 229a7878569..aa9929be800 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -57,12 +57,12 @@ $offset = $limit * $_GET["page"] ; llxHeader('',$langs->trans('ListOfSendings'),'ch-expedition.html'); -$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut, s.nom"; +$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut, s.nom as socname, s.idp"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user"; $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 e.fk_commande = c.rowid AND c.fk_soc = s.idp"; if ($socidp) { $sql.= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = ".$socidp; @@ -109,7 +109,7 @@ if ($resql) print ""; print "rowid\">".img_object($langs->trans("ShowSending"),"sending").' '; print "rowid\">".$objp->ref."\n"; - print ''.$objp->nom.''; + print ''.$objp->socname.''; $now = time(); $lim = 3600 * 24 * 15 ;