Look: Modif esthétique mineure

This commit is contained in:
Laurent Destailleur 2005-08-14 22:29:38 +00:00
parent b63847473f
commit 626f5503d5
3 changed files with 35 additions and 34 deletions

View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -34,10 +33,10 @@ $langs->load("sendings");
llxHeader('',$langs->trans("Sendings"),'ch-expedition.html',$form_search); llxHeader('',$langs->trans("Sendings"),'ch-expedition.html',$form_search);
print_titre($langs->trans("Sendings")); print_fiche_titre($langs->trans("Sendings"));
print '<table class="noborder" width="100%">'; print '<table class="notopnoleftnoright" width="100%">';
print '<tr><td valign="top" width="30%">'; print '<tr><td valign="top" width="30%" class="notopnoleft">';
$var=false; $var=false;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -55,29 +54,30 @@ $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s,
$sql.= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 0"; $sql.= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 0";
if ($socidp) if ($socidp)
{ {
$sql .= " AND c.fk_soc = $socidp"; $sql .= " AND c.fk_soc = $socidp";
} }
if ( $db->query($sql) ) $resql=$db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">Expeditions à valider</td></tr>'; print '<td colspan="3">'.$langs->trans("SendingsToValidate").'</td></tr>';
$i = 0; $i = 0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object(); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>"; print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>'; print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>';
$i++; $i++;
} }
print "</table><br>"; print "</table><br>";
} }
} }

View File

@ -22,18 +22,16 @@
*/ */
/** /**
\file htdocs/expedition/liste.php \file htdocs/expedition/liste.php
\ingroup expedition \ingroup expedition
\brief Page de la liste des expéditions/livraisons \brief Page de la liste des expéditions/livraisons
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
if (!$user->rights->expedition->lire) accessforbidden(); if (!$user->rights->expedition->lire) accessforbidden();
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -48,12 +46,15 @@ if (! $sortorder) $sortorder="DESC";
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $_GET["page"] ; $offset = $limit * $_GET["page"] ;
/******************************************************************************/ /******************************************************************************/
/* */ /* */
/* Fin des Actions */ /* Fin des Actions */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
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" ; $sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut" ;

View File

@ -21,11 +21,11 @@
* *
*/ */
/*! /**
\file htdocs/expedition/pre.inc.php \file htdocs/expedition/pre.inc.php
\ingroup expedition \ingroup expedition
\brief Fichier de gestion du menu gauche du module expedition \brief Fichier de gestion du menu gauche du module expedition
\version $Revision$ \version $Revision$
*/ */
require("../main.inc.php"); require("../main.inc.php");