diff --git a/htdocs/comm/contact.php3 b/htdocs/comm/contact.php3 index 75a228580f8..4755df495be 100644 --- a/htdocs/comm/contact.php3 +++ b/htdocs/comm/contact.php3 @@ -118,7 +118,7 @@ if ($result) print ''.$obj->name.''; print "$obj->firstname"; - print 'filtrer '; + print 'filtrer '; print "idp\">$obj->nom\n"; print ''.$obj->email.' '; diff --git a/htdocs/fourn/fiche.php3 b/htdocs/fourn/fiche.php3 index 0f57efc2f3d..bf3f8cbb3a6 100644 --- a/htdocs/fourn/fiche.php3 +++ b/htdocs/fourn/fiche.php3 @@ -25,8 +25,6 @@ require("../contact.class.php3"); llxHeader(); -$db = new Db(); - /* * Sécurité accés client */ @@ -152,7 +150,7 @@ if ($socid > 0) { print "
Fiche fournisseur : $objsoc->nom
"; - print 'Nouvelle Facture Nouvelle facture'; + print 'Nouvelle Facture Nouvelle facture'; print "[idp&action=edit\">Editer]"; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 55d9482bbb4..9ca726c61a6 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -90,85 +90,89 @@ if ($mode == 'search') { } } - /* - * Mode Liste - * - * - * - */ +/* + * Mode Liste + * + * + * + */ - if ($sortorder == "") +if ($sortorder == "") +{ + $sortorder="ASC"; +} +if ($sortfield == "") +{ + $sortfield="nom"; +} + + +print_barre_liste("Liste des fournisseurs",$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 FROM llx_societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id AND s.fournisseur=1"; + +if (strlen($stcomm)) { + $sql .= " AND s.fk_stcomm=$stcomm"; +} + +if ($socidp) { + $sql .= " AND s.idp=$socidp"; +} + +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"; +} + +$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset); + +$result = $db->query($sql); +if ($result) +{ + $num = $db->num_rows(); + $i = 0; + + if ($sortorder == "DESC") { + $sortorder="ASC"; + } else { + $sortorder="DESC"; + } + print "

"; + print '"; + print ""; + print "\n"; + $var=True; + while ($i < $num) { - $sortorder="ASC"; - } - if ($sortfield == "") - { - $sortfield="nom"; - } - - - print_barre_liste("Liste des fournisseurs",$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 FROM llx_societe as s, c_stcomm as st WHERE s.fk_stcomm = st.id AND s.fournisseur=1"; - - if (strlen($stcomm)) { - $sql .= " AND s.fk_stcomm=$stcomm"; - } - - if ($socidp) { - $sql .= " AND s.idp=$socidp"; - } - - 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"; - } - - $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit, $offset); - - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows(); - $i = 0; - - if ($sortorder == "DESC") { - $sortorder="ASC"; - } else { - $sortorder="DESC"; - } - print "

'; + print_liste_field_titre("Société",$PHP_SELF,"s.nom"); + print "Ville 
"; - print '"; - print ""; - print "\n"; - $var=True; - while ($i < $num) { $obj = $db->fetch_object( $i); - + $var=!$var; print ""; print "\n"; print "\n"; - + print "\n"; - print ''; + print ''; - print "\n"; + print "\n"; $i++; } - print "
'; - print_liste_field_titre("Société",$PHP_SELF,"s.nom"); - print "Ville 
idp\">$obj->nom".$obj->ville."$obj->prefix_comm Nouvelle factureNouvelle facture
"; - $db->free(); - } else { - print $db->error(); - } + print ""; + $db->free(); +} +else +{ + print $db->error(); +} $db->close();