';
+print '';
+print '';
$var=false;
print '';
@@ -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 ' ";
+ print '';
+ print '';
+ print '| '.$langs->trans("SendingsToValidate").' | ';
+ $i = 0;
+ $var = True;
+ while ($i < $num)
+ {
+ $var=!$var;
+ $obj = $db->fetch_object($resql);
+ print "| rowid\">$obj->ref | ";
+ print ''.$obj->nom.' | ';
+ print ''.$obj->commande_ref.' | ';
+ $i++;
+ }
+ print " ";
}
}
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");
| |