lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

faire apparaitre le nom de la socit sur la liste des expditions

Browse Source
This commit is contained in:
Regis Houssin 2006-05-06 10:30:38 +00:00
parent 08522647fc
commit dc4e9a0027
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/liste.php
View File

@ -57,12 +57,12 @@ $offset = $limit * $_GET["page"] ;
llxHeader('',$langs->trans('ListOfSendings'),'ch-expedition.html'); 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"; 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"; $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 (!$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"; 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) if ($socidp)
{ {
$sql.= $sql_add . " e.fk_commande = c.rowid AND c.fk_soc = ".$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 "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?id=$objp->rowid\">".img_object($langs->trans("ShowSending"),"sending").'</a>&nbsp;'; 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=\"fiche.php?id=$objp->rowid\">".$objp->ref."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?id='.$objp->fk_soc.'">'.$objp->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?id='.$objp->idp.'">'.$objp->socname.'</a></td>';
$now = time(); $now = time();
$lim = 3600 * 24 * 15 ; $lim = 3600 * 24 * 15 ;