diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index cc4e7a8850c..1e084663991 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -22,17 +22,17 @@ */ /** - \file htdocs/expedition/index.php - \ingroup expedition - \brief Page accueil du module expedition - \version $Revision$ + \file htdocs/expedition/index.php + \ingroup expedition + \brief Page accueil du module expedition + \version $Revision$ */ require("./pre.inc.php"); $langs->load("sendings"); -llxHeader('','Expéditions','ch-expedition.html',$form_search); +llxHeader('',$langs->trans("Sendings"),'ch-expedition.html',$form_search); print_titre($langs->trans("Sendings")); @@ -43,14 +43,15 @@ print '
'; print ''; print ''; print "'; +print $langs->trans("Ref").' : '; print "
'.$langs->trans("SearchASending").'
"; -print $langs->trans("Ref").' :

\n"; /* * Expeditions à valider */ -$sql = "SELECT e.rowid, e.ref, s.nom, s.idp, c.ref as commande_ref, c.rowid as commande_id FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; -$sql .= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 0"; +$sql = "SELECT e.rowid, e.ref, s.nom, s.idp, c.ref as commande_ref, c.rowid as commande_id"; +$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; +$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"; @@ -83,9 +84,10 @@ if ( $db->query($sql) ) /* * Commandes à traiter */ -$sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 1"; -$sql .= " ORDER BY c.rowid ASC"; +$sql = "SELECT c.rowid, c.ref, s.nom, s.idp"; +$sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s"; +$sql.= " WHERE c.fk_soc = s.idp AND c.fk_statut = 1"; +$sql.= " ORDER BY c.rowid ASC"; if ( $db->query($sql) ) { @@ -103,8 +105,8 @@ if ( $db->query($sql) ) { $var=!$var; $obj = $db->fetch_object(); - print "rowid\">".img_file()." "; - print "rowid\">$obj->ref"; + print ""; + print "rowid\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.''; print ''.$obj->nom.''; $i++; } @@ -141,8 +143,8 @@ if ( $resql ) { $var=!$var; $obj = $db->fetch_object($resql); - print "rowid\">".img_file()." "; - print "rowid\">$obj->ref"; + print "rowid\">".img_object($langs->trans("ShowOrder"),"order").' '; + print $obj->ref.''; print ''.$obj->nom.''; $i++; } @@ -154,9 +156,9 @@ if ( $resql ) /* * Expeditions à valider */ -$sql = "SELECT e.rowid, e.ref, s.nom, s.idp, c.ref as commande_ref, c.rowid as commande_id FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; -$sql .= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 1"; - +$sql = "SELECT e.rowid, e.ref, s.nom, s.idp, c.ref as commande_ref, c.rowid as commande_id"; +$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; +$sql.= " WHERE e.fk_commande = c.rowid AND c.fk_soc = s.idp AND e.fk_statut = 1"; $sql .= $db->plimit(5, 0); if ( $db->query($sql) ) @@ -173,10 +175,10 @@ if ( $db->query($sql) ) { $var=!$var; $obj = $db->fetch_object(); - print "rowid\">".img_file()." "; - print "rowid\">$obj->ref"; - print ''.$obj->nom.''; - print ''.$obj->commande_ref.''; + print "rowid\">".img_object($langs->trans("ShowSending"),"sending").' '; + print $obj->ref.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowOrder"),"order").' '.$obj->commande_ref.''; $i++; } print "
"; @@ -187,5 +189,6 @@ print ''; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); + ?>