From 626f5503d5309002b242c888764a7822597c0fb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 14 Aug 2005 22:29:38 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tique=20mineure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/expedition/index.php   | 46 +++++++++++++++++------------------
 htdocs/expedition/liste.php   | 13 +++++-----
 htdocs/expedition/pre.inc.php | 10 ++++----
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index a9c853f7855..fbb8ac3e6b4 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -34,10 +33,10 @@ $langs->load("sendings");
 
 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 '<tr><td valign="top" width="30%">';
+print '<table class="notopnoleftnoright" width="100%">';
+print '<tr><td valign="top" width="30%" class="notopnoleft">';
 
 $var=false;
 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";
 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();
-  if ($num)
+    $num = $db->num_rows($resql);
+    if ($num)
     {
-      print '<table class="noborder" width="100%">';
-      print '<tr class="liste_titre">';
-      print '<td colspan="3">Expeditions à valider</td></tr>';
-      $i = 0;
-      $var = True;
-      while ($i < $num)
-	{
-	  $var=!$var;
-	  $obj = $db->fetch_object();
-	  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.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>';
-	  $i++;
-	}
-      print "</table><br>";
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td colspan="3">'.$langs->trans("SendingsToValidate").'</td></tr>';
+        $i = 0;
+        $var = True;
+        while ($i < $num)
+        {
+            $var=!$var;
+            $obj = $db->fetch_object($resql);
+            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.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>';
+            $i++;
+        }
+        print "</table><br>";
     }
 }
 
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index 43c067a888a..d72698f8b1e 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -22,18 +22,16 @@
  */
 
 /**
-   \file       htdocs/expedition/liste.php
-   \ingroup    expedition
-   \brief      Page de la liste des expéditions/livraisons
+        \file       htdocs/expedition/liste.php
+        \ingroup    expedition
+        \brief      Page de la liste des expéditions/livraisons
 */
 
 require("./pre.inc.php");
 
 if (!$user->rights->expedition->lire) accessforbidden();
 
-/*
- * Sécurité accés client
- */
+// Sécurité accés client
 if ($user->societe_id > 0) 
 {
   $action = '';
@@ -48,12 +46,15 @@ if (! $sortorder) $sortorder="DESC";
 $limit = $conf->liste_limit;
 $offset = $limit * $_GET["page"] ;
 
+
+
 /******************************************************************************/
 /*                                                                            */
 /*                   Fin des  Actions                                         */
 /*                                                                            */
 /******************************************************************************/
 
+
 llxHeader('',$langs->trans('ListOfSendings'),'ch-expedition.html');
 
 $sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut" ;
diff --git a/htdocs/expedition/pre.inc.php b/htdocs/expedition/pre.inc.php
index 4210571d5f8..df36b74c87f 100644
--- a/htdocs/expedition/pre.inc.php
+++ b/htdocs/expedition/pre.inc.php
@@ -21,11 +21,11 @@
  *
  */
 
-/*!
-  \file htdocs/expedition/pre.inc.php
-  \ingroup    expedition
-  \brief      Fichier de gestion du menu gauche du module expedition
-  \version    $Revision$
+/**
+        \file       htdocs/expedition/pre.inc.php
+        \ingroup    expedition
+        \brief      Fichier de gestion du menu gauche du module expedition
+        \version    $Revision$
 */
 
 require("../main.inc.php");