diff --git a/htdocs/societe.php b/htdocs/societe.php
index f95d3594b26..816f8dd0635 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -58,12 +58,8 @@ $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
 $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
 $page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
 
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-if ($sortfield == "") {
-  $sortfield="nom";
-}
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="nom";
 
 if ($page == -1) { $page = 0 ; }
 
@@ -86,15 +82,17 @@ if ($mode == 'search')
   $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s ";
   $sql .= " WHERE s.nom like '%".$socname."%'";
   
-  if ( $db->query($sql) )
+  $result=$db->query($sql);
+  if ($result)
     {
-      if ( $db->num_rows() == 1)
+      if ($db->num_rows($result) == 1)
 	{
-	  $obj = $db->fetch_object();
+	  $obj = $db->fetch_object($result);
 	  $socid = $obj->idp;
 	}
-      $db->free();
+      $db->free($result);
     }
+
   /*
    * Sécurité accés client
    */
@@ -110,6 +108,7 @@ if ($_POST["button_removefilter"] == $langs->trans("RemoveFilter")) {
     $search_ville="";
 }
 
+
 /*
  * Mode Liste
  *
@@ -154,7 +153,7 @@ $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $
 $result = $db->query($sql);
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;
 
   $params = "&socname=$socname";
@@ -166,9 +165,7 @@ if ($result)
   print '<tr class="liste_titre">';
   print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params,"&search_nom=$search_nom&search_ville=$search_ville","",$sortfield);
   print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params,"&search_nom=$search_nom&search_ville=$search_ville",'',$sortfield);
-
   print_liste_field_titre($langs->trans("SIREN"),"societe.php","s.siren",$params,"&search_nom=$search_nom&search_ville=$search_ville",'',$sortfield);
-
   print '<td colspan="2" align="center">&nbsp;</td>';
   print "</tr>\n";
 
@@ -184,7 +181,6 @@ if ($result)
   print '</td><td valign="right">';
   print '<input class="fat" size="10" type="text" name="search_siren" value="'.$_POST["search_siren"].'">';
 
-
   print '</td><td colspan="2" align="center">';
   print '<input type="submit" class="button" name="button_search" value="'.$langs->trans("Search").'">';
   print '&nbsp; <input type="submit" class="button" name="button_removefilter" value="'.$langs->trans("RemoveFilter").'">';