diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 46f962a7b07..dc4c56189e1 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -57,9 +57,9 @@ $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"; +$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut, s.nom"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user"; -$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e"; +$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 "; @@ -95,6 +95,7 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","","&socidp=$socidp",'width="15%"',$sortfield); + print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", "&socidp=$socidp",'width="25%" align="left"',$sortfield); print_liste_field_titre($langs->trans("Date"),"liste.php","e.date_expedition","","&socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield); print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","","&socidp=$socidp",'width="10%" align="center"',$sortfield); print "\n"; @@ -108,6 +109,7 @@ if ($resql) print ""; print "rowid\">".img_object($langs->trans("ShowSending"),"sending").' '; print "rowid\">".$objp->ref."\n"; + print "fk_soc\">".$objp->nom."\n"; $now = time(); $lim = 3600 * 24 * 15 ;