diff --git a/htdocs/societe.php b/htdocs/societe.php
index ac2b850ff46..2062d07044e 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -1,8 +1,5 @@
- *
- * $Id$
- * $Source$
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * $Id$
+ * $Source$
*/
require("./pre.inc.php3");
require("./contact.class.php3");
@@ -64,87 +63,94 @@ if ($mode == 'search') {
}
- /*
- * Mode Liste
- *
- *
- *
- */
- print_barre_liste("Liste des societes", $page, $PHP_SELF);
+/*
+ * Mode Liste
+ *
+ *
+ *
+ */
+print_barre_liste("Liste des societes", $page, $PHP_SELF);
- $sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur FROM societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id";
+$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur";
+$sql .= " FROM societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id";
- if (strlen($stcomm)) {
- $sql .= " AND s.fk_stcomm=$stcomm";
- }
+if (strlen($stcomm)) {
+ $sql .= " AND s.fk_stcomm=$stcomm";
+}
- if (strlen($begin)) {
- $sql .= " AND upper(s.nom) like '$begin%'";
- }
+if (strlen($begin)) {
+ $sql .= " AND upper(s.nom) like '$begin%'";
+}
- if ($socname) {
- $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
- $sortfield = "lower(s.nom)";
- $sortorder = "ASC";
- }
+if ($socname) {
+ $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
+ $sortfield = "lower(s.nom)";
+ $sortorder = "ASC";
+}
- $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
+$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset);
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows();
- $i = 0;
-
- if ($sortorder == "DESC") {
+$result = $db->query($sql);
+if ($result) {
+ $num = $db->num_rows();
+ $i = 0;
+
+ if ($sortorder == "DESC")
+ {
$sortorder="ASC";
- } else {
+ }
+ else
+ {
$sortorder="DESC";
}
- print "
";
- print '';
- print "| ";
- print_liste_field_titre("Société",$PHP_SELF,"s.nom");
- print " | Ville | ";
- print "email | ";
- print "Statut | | ";
+ print "";
+ print '';
+ print "| ";
+ print_liste_field_titre("Société",$PHP_SELF,"s.nom");
+ print " | ";
+ print_liste_field_titre("Ville",$PHP_SELF,"s.ville");
+ print " | email | ";
+ print "Statut | | ";
+ print "
\n";
+ $var=True;
+ while ($i < $num) {
+ $obj = $db->fetch_object( $i);
+
+ $var=!$var;
+
+ print "";
+ print "| idp\">$obj->nom | \n";
+ print "".$obj->ville." | \n";
+ print " | \n";
+ print '';
+ if ($obj->client)
+ {
+ print "idp\">client | \n";
+ }
+ else
+ {
+ print " ";
+ }
+ print "";
+ if ($obj->fournisseur)
+ {
+ print "idp\">fournisseur | \n";
+ }
+ else
+ {
+ print " ";
+ }
+
print "
\n";
- $var=True;
- while ($i < $num) {
- $obj = $db->fetch_object( $i);
-
- $var=!$var;
-
- print "";
- print "| idp\">$obj->nom | \n";
- print "".$obj->ville." | \n";
- print " | \n";
- print '';
- if ($obj->client)
- {
- print "idp\">client | \n";
- }
- else
- {
- print " ";
- }
- print "";
- if ($obj->fournisseur)
- {
- print "idp\">fournisseur | \n";
- }
- else
- {
- print " ";
- }
-
- print "
\n";
- $i++;
- }
- print "
";
- $db->free();
- } else {
- print $db->error() . ' ' . $sql;
+ $i++;
}
+ print "
";
+ $db->free();
+}
+else
+{
+ print $db->error() . ' ' . $sql;
+}
$db->close();