diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 57bd8d0e8d3..e6334496b8c 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -257,6 +257,7 @@ if ($account > 0)
   if ($result)
     {
       _print_lines($db, $sql, $acct);
+      $db->free($result);
     }
 
 
@@ -409,6 +410,6 @@ function _print_lines($db,$sql,$acct)
 	  
 	  $i++;
 	}
-      $db->free();
+
 }
 ?>
diff --git a/htdocs/compta/export/liste.php b/htdocs/compta/export/liste.php
index 24a17114478..b5d3e4f28a7 100644
--- a/htdocs/compta/export/liste.php
+++ b/htdocs/compta/export/liste.php
@@ -69,15 +69,16 @@ $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;
   
-  print_barre_liste("Exports", $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num);
+  print_barre_liste($langs->trans("Exports"), $page, "liste.php", $urladd, $sortfield, $sortorder, '', $num);
+
   print"\n<!-- debut table -->\n";
-  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+  print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
 
-  print_liste_field_titre("Réf","liste.php","ec.ref");
+  print_liste_field_titre($langs->trans("Ref"),"liste.php","ec.ref");
 
   print '<td>Client facturé</td>';
 
@@ -89,7 +90,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
       $var=!$var;
 
       print "<tr $bc[$var]>";
@@ -100,11 +101,11 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7e5df3c917a..575ae9fec73 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -165,7 +165,7 @@ if ($_GET["facid"] > 0)
       $result_sql = $db->query($sql);
       if ($result_sql)
 	{
-	  $num = $db->num_rows();
+	  $num = $db->num_rows($result_sql);
 	}
 
 
@@ -184,7 +184,7 @@ if ($_GET["facid"] > 0)
       /*
        * Prélèvement
        */
-      print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+      print '<table class="noborder" width="100%">';
 
       print '<tr class="liste_titre">';      
       print '<td align="center">Date demande</td>';
@@ -201,7 +201,7 @@ if ($_GET["facid"] > 0)
 	  
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object($i);	
+	      $obj = $db->fetch_object($result_sql);	
 	      $var=!$var;
 	      
 	      print "<tr $bc[$var]>";	      	      
@@ -218,7 +218,7 @@ if ($_GET["facid"] > 0)
 	      $i++;
 	    }
 
-	  $db->free();
+	  $db->free($result_sql);
 	}
       else 
 	{
@@ -239,12 +239,12 @@ if ($_GET["facid"] > 0)
       $result = $db->query($sql);
       if ($result)
 	{
-	  $num = $db->num_rows();
+	  $num = $db->num_rows($result);
 	  $i = 0;
 	  
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object($i);	
+	      $obj = $db->fetch_object($result);	
 	      $var=!$var;
 	      
 	      print "<tr $bc[$var]>";
@@ -265,7 +265,7 @@ if ($_GET["facid"] > 0)
 	      $i++;
 	    }
 
-	  $db->free();
+	  $db->free($result);
 	}
       else 
 	{
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index a53304068d1..427e5df21bc 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -217,7 +217,7 @@ if ($_GET["action"] == 'create')
 	  $result = $db->query($sql);
 	  if ($result)
 	    {
-	      $num = $db->num_rows();
+	      $num = $db->num_rows($result);
 	      $i = 0; 
 	      while ($i < $num)
 		{
@@ -249,9 +249,10 @@ if ($_GET["action"] == 'create')
 //	  $sql .= " AND f.fk_statut = 1";  // Statut=0 => non validée, Statut=2 => annulée
 //	  $sql .= " GROUP BY f.facnumber";  
 //
-//	  if ($db->query($sql))
+//    $result=$db->query($sql);
+//	  if ($result)
 //	    {
-//	      $num = $db->num_rows();
+//	      $num = $db->num_rows($result);
 //	      
 //	      if ($num > 0)
 //		{
@@ -273,7 +274,7 @@ if ($_GET["action"] == 'create')
 		  
 		  while ($i < $num)
 		    {
-		      //$objp = $db->fetch_object($i);
+		      //$objp = $db->fetch_object($result);
 		      $objp = $charge;
 		      
 		      $var=!$var;
diff --git a/htdocs/compta/param/comptes/fiche.php b/htdocs/compta/param/comptes/fiche.php
index 7ddb9d9cf34..27788497f99 100644
--- a/htdocs/compta/param/comptes/fiche.php
+++ b/htdocs/compta/param/comptes/fiche.php
@@ -205,15 +205,16 @@ else
 	      $sql .=" WHERE pf.fk_soc = s.idp AND pf.fk_product = ".$product->id;
 	      $sql .= " ORDER BY lower(s.nom)";
 	      
-	      if ( $db->query($sql) )
+	      $result=$db->query($sql);
+	      if ($result)
 		{
-		  $num_fournisseur = $db->num_rows();
+		  $num_fournisseur = $db->num_rows($result);
 		  $i = 0;
 		  print '<table class="noborder" width="100%">';
 		  $var=True;      
 		  while ($i < $num_fournisseur)
 		    {
-		      $objp = $db->fetch_object($i);	  
+		      $objp = $db->fetch_object($result);	  
 		      $var=!$var;
 		      print "<tr $bc[$var]>";
 		      print '<td><a href="../fourn/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
@@ -223,7 +224,7 @@ else
 		      $i++;
 		    }
 		  print '</table>';
-		  $db->free();
+		  $db->free($result);
 		}
 
 	      print '</td></tr>';
@@ -309,13 +310,14 @@ else
 	  $sql = "SELECT s.idp, s.nom, s.ville FROM ".MAIN_DB_PREFIX."societe as s WHERE s.fournisseur=1";	     
 	  $sql .= " ORDER BY lower(s.nom)";
 	  
-	  if ($db->query($sql))
+	  $result=$db->query($sql);
+	  if ($result)
 		{
-		  $num = $db->num_rows();
+		  $num = $db->num_rows($result);
 		  $i = 0;		  		  
 		  while ($i < $num)
 		    {
-		      $obj = $db->fetch_object($i);
+		      $obj = $db->fetch_object($result);
 		      print '<option value="'.$obj->idp.'">'.$obj->nom . ($obj->ville?" ($obj->ville)":"");
 		      $i++;
 		    }
@@ -468,15 +470,16 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
       $sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
       $sql .= " ORDER BY p.datec DESC, tms DESC";
       
-      if ( $db->query($sql) )
+      $result=$db->query($sql);
+      if ($result)
 	{
-	  $num = $db->num_rows();
+	  $num = $db->num_rows($result);
 	  $i = 0;
 	  print '<table class="noborder" width="100%">';
 	  $var=True;      
 	  while ($i < $num)
 	    {
-	      $objp = $db->fetch_object($i);	  
+	      $objp = $db->fetch_object($result);
 	      $var=!$var;
 	      print "<tr $bc[$var]>";
 	      print "<td><a href=\"../comm/propal.php?propalid=$objp->propalid\">$objp->ref</a></TD>\n";
@@ -495,7 +498,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente)
 	      $i++;
 	    }      
 	  print "</table>";
-	  $db->free();
+	  $db->free($result);
 	}
 
       print '</td>';
diff --git a/htdocs/compta/param/comptes/liste.php b/htdocs/compta/param/comptes/liste.php
index 3890aa5b2ed..70b29493d9b 100644
--- a/htdocs/compta/param/comptes/liste.php
+++ b/htdocs/compta/param/comptes/liste.php
@@ -87,7 +87,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;
   
   print_barre_liste("Comptes généraux", $page, "liste.php", "", $sortfield, $sortorder, '', $num);
@@ -111,7 +111,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
       $var=!$var;
 
       print "<tr $bc[$var]>";
@@ -126,11 +126,11 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index b796ea16319..3cfb31b73a7 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -65,7 +65,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;
   
   $urladd= "&amp;statut=".$_GET["statut"];
@@ -93,7 +93,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       print "<tr $bc[$var]><td>";
@@ -109,7 +109,7 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index dbc0d628971..224f36406a1 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -117,7 +117,7 @@ $result = $db->query($sql);
 
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;
   
   $urladd = "&amp;id=".$_GET["id"];
@@ -137,7 +137,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
 
@@ -188,11 +188,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php
index b7673a9e5aa..11762c466e0 100644
--- a/htdocs/compta/prelevement/facturesrejets.php
+++ b/htdocs/compta/prelevement/facturesrejets.php
@@ -97,7 +97,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;
   
   print_barre_liste("Prélèvements rejetés", $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num);
@@ -116,7 +116,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
 
@@ -147,11 +147,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 14b4895a8dc..73a71a4e801 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -106,7 +106,7 @@ $sql .= " ORDER BY pl.amount DESC";
 $result = $db->query($sql);
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;
   
   print_barre_liste("Lignes de prélèvement rejetées", $page, "fiche-rejet.php", $urladd, $sortfield, $sortorder, '', $num);
@@ -121,7 +121,7 @@ if ($result)
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
       print '<img border="0" src="./statut'.$obj->statut.'.png"></a>&nbsp;';
@@ -140,11 +140,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 398d2d363c4..7d536cec776 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -56,7 +56,7 @@ $sql .= " ORDER BY datec DESC LIMIT 5";
 $result = $db->query($sql);
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;  
   $var=True;
 
@@ -68,7 +68,7 @@ if ($result)
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
       $var=!$var;
 
       print "<tr $bc[$var]><td>";
@@ -85,7 +85,7 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 54e40b53f38..c997a637d0d 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -212,7 +212,7 @@ if ($_GET["id"])
 
   if ($result)
     {
-      $num = $db->num_rows();
+      $num = $db->num_rows($result);
       $i = 0;
   
       $urladd = "&amp;id=".$_GET["id"];
@@ -230,7 +230,7 @@ if ($_GET["id"])
 
       while ($i < min($num,$conf->liste_limit))
 	{
-	  $obj = $db->fetch_object($i);	
+	  $obj = $db->fetch_object($result);	
 
 	  print "<tr $bc[$var]><td>";
 
@@ -253,11 +253,11 @@ if ($_GET["id"])
 
       print "</table>";
 
-      $db->free();
+      $db->free($result);
     }
   else 
     {
-      print $db->error() . ' ' . $sql;
+      dolibarr_print_error($db);
     }
 
   $db->close();
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 3be772ed917..47a70e11ba6 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -118,7 +118,7 @@ $result = $db->query($sql);
 
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;
   
   $urladd = "&amp;id=".$_GET["id"];
@@ -138,7 +138,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
 
@@ -183,11 +183,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index 7d75d756cd6..87a990fe0fd 100644
--- a/htdocs/compta/prelevement/liste.php
+++ b/htdocs/compta/prelevement/liste.php
@@ -72,7 +72,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;
   
   $urladd = "&amp;statut=".$_GET["statut"];
@@ -106,7 +106,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
       $var=!$var;
 
       print "<tr $bc[$var]><td>";
@@ -128,11 +128,11 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php
index be0cceccf93..48422acf779 100644
--- a/htdocs/compta/prelevement/liste_factures.php
+++ b/htdocs/compta/prelevement/liste_factures.php
@@ -77,7 +77,7 @@ $result = $db->query($sql);
 
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0;
   
   $urladd = "&amp;socid=".$_GET["socid"];
@@ -111,7 +111,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
 
@@ -146,11 +146,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 53c44093c11..038b3587ffa 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -91,7 +91,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;
   
   print_barre_liste("Prélèvements rejetés", $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num);
@@ -109,7 +109,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
 
       print "<tr $bc[$var]><td>";
       print '<img border="0" src="./statut'.$obj->statut.'.png"></a>&nbsp;';
@@ -126,11 +126,11 @@ if ($result)
     }
 
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index f48e071302f..fff913f6ee1 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -89,13 +89,15 @@ if ($modecompta != 'CREANCES-DETTES') {
 	$sql .= " AND f.paye = 1";
 }
 $sql .= " GROUP BY dm DESC";
-if ($db->query($sql))
+
+$result=$db->query($sql);
+if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0; 
   while ($i < $num)
     {
-      $row = $db->fetch_object($i);
+      $row = $db->fetch_object($result);
       $encaiss[$row->dm] = $row->amount_ht;
       $encaiss_ttc[$row->dm] = $row->amount_ttc;
       $i++;
@@ -104,6 +106,7 @@ if ($db->query($sql))
 else {
 	dolibarr_print_error($db);	
 }
+$db->free($result);
 
 /*
  * Frais, factures fournisseurs.
@@ -123,13 +126,14 @@ if ($modecompta != 'CREANCES-DETTES') {
 }
 $sql .= " GROUP BY dm DESC";
 
-if ($db->query($sql))
+$result=$db->query($sql);
+if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
   $i = 0; 
   while ($i < $num)
     {
-      $row = $db->fetch_object($i);
+      $row = $db->fetch_object($result);
       $decaiss[$row->dm] = $row->amount_ht;
       $decaiss_ttc[$row->dm] = $row->amount_ttc;
       $i++;
@@ -138,7 +142,7 @@ if ($db->query($sql))
 else {
 	dolibarr_print_error($db);	
 }
-
+$db->free($result);
 
 /*
  * Tableau
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index 297580392eb..bde13fbf63e 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -99,7 +99,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;
   
   $langs->load("orders");
@@ -131,7 +131,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object($i);	
+      $obj = $db->fetch_object($result);	
       $var=!$var;
 
       print "<tr $bc[$var]>";
@@ -154,7 +154,7 @@ if ($result)
       $i++;
     }
   print "</table>";
-  $db->free();
+  $db->free($result);
 }
 else 
 {
diff --git a/htdocs/product/album/album.class.php b/htdocs/product/album/album.class.php
index 79a61ef58c3..7d30482339e 100644
--- a/htdocs/product/album/album.class.php
+++ b/htdocs/product/album/album.class.php
@@ -129,26 +129,29 @@ class Album {
     $sql .= " WHERE g.rowid = l.fk_groupart AND l.fk_album = ".$this->id;
     $sql .= " ORDER BY g.nom";
 
-    if ($this->db->query($sql) )
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
 	      }
+	      $this->db->free($result);
 	  }
 	return $ga;
       }
     else
       {
-	print $this->db->error();
+	    print $this->db->error();
+	    return -1;
       }    
   }
   /*
diff --git a/htdocs/product/categorie/categorie.class.php b/htdocs/product/categorie/categorie.class.php
index 97033e433c0..cd960eeb018 100644
--- a/htdocs/product/categorie/categorie.class.php
+++ b/htdocs/product/categorie/categorie.class.php
@@ -159,33 +159,33 @@ class Categorie {
     $sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
     $sql .= " AND c.parent_id = " . $this->id;
     $sql .= " ORDER BY cd.categories_name";
-    if ($this->db->query($sql) )
+    
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->categories_id] = $obj->categories_name;
 		$i++;
 	      }
+        $this->db->free($result);
 	  }
 	return $ga;
       }
     else
       {
 	print $this->db->error();
+	return -1;
       }    
   }
-  /*
-   *
-   *
-   *
-   */
+
   /*
    *
    *
diff --git a/htdocs/product/concert/concert.class.php b/htdocs/product/concert/concert.class.php
index 9f9a8689ee5..b27bb001bd2 100644
--- a/htdocs/product/concert/concert.class.php
+++ b/htdocs/product/concert/concert.class.php
@@ -94,7 +94,7 @@ class Concert {
     $result = $this->db->query($sql) ;
 
     if ( $result ) {
-      $result = $this->db->fetch_array();
+      $result = $this->db->fetch_array($result);
 
       $this->id            = $result["rowid"];
       $this->date          = $result["dc"];
@@ -103,18 +103,12 @@ class Concert {
       $this->groupartid    = $result["fk_groupart"];
       $this->lieuid        = $result["fk_lieu_concert"];
     }
-    $this->db->free();
+    $this->db->free($result);
 
-    return $result;
+    return $this->id;
   }
 
 
-  /*
-   *
-   *
-   */
-
-
   /*
    *
    *
@@ -127,16 +121,17 @@ class Concert {
     $sql .= " WHERE g.rowid = l.fk_groupart AND l.fk_album = ".$this->id;
     $sql .= " ORDER BY g.nom";
 
-    if ($this->db->query($sql) )
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
@@ -147,6 +142,7 @@ class Concert {
     else
       {
 	print $this->db->error();
+	return -1;
       }    
   }
 
diff --git a/htdocs/product/concert/lieuconcert.class.php b/htdocs/product/concert/lieuconcert.class.php
index 5bcbc1e1f2f..56c4ba0471b 100644
--- a/htdocs/product/concert/lieuconcert.class.php
+++ b/htdocs/product/concert/lieuconcert.class.php
@@ -128,16 +128,18 @@ class LieuConcert {
 
     $sql = "SELECT rowid, nom, ville, description FROM ".MAIN_DB_PREFIX."lieu_concert";
     $sql .= " ORDER BY ville, nom"; 
-    if ($this->db->query($sql) )
+    
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->rowid] = $obj->ville . " - " .$obj->nom;
 		$i++;
@@ -148,6 +150,7 @@ class LieuConcert {
     else
       {
 	print $this->db->error();
+	return -1;
       }    
   }
 
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 59267ade903..e2ff9f559de 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -530,13 +530,14 @@ else
 	      $sql = "SELECT s.idp, s.nom, s.ville FROM ".MAIN_DB_PREFIX."societe as s WHERE s.fournisseur=1";	     
 	      $sql .= " ORDER BY lower(s.nom)";
 	  
-	      if ($db->query($sql))
+	        $result=$db->query($sql);
+	      if ($result)
 		{
-		  $num = $db->num_rows();
+		  $num = $db->num_rows($result);
 		  $i = 0;		  		  
 		  while ($i < $num)
 		    {
-		      $obj = $db->fetch_object($i);
+		      $obj = $db->fetch_object($result);
 		      print '<option value="'.$obj->idp.'">'.$obj->nom . ($obj->ville?" ($obj->ville)":"");
 		      $i++;
 		    }
diff --git a/htdocs/product/groupart/groupart.class.php b/htdocs/product/groupart/groupart.class.php
index cec163c209f..e64507b29c8 100644
--- a/htdocs/product/groupart/groupart.class.php
+++ b/htdocs/product/groupart/groupart.class.php
@@ -117,16 +117,17 @@ class Groupart {
     $sql .= " WHERE a.rowid = l.fk_album AND l.fk_groupart = ".$this->id;
     $sql .= " ORDER BY a.title";
 
-    if ($this->db->query($sql) )
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->rowid] = $obj->title;
 		$i++;
@@ -137,6 +138,7 @@ class Groupart {
     else
       {
 	print $this->db->error();
+	return -1;
       }    
   }
   /*
@@ -165,16 +167,17 @@ class Groupart {
 
     $sql = "SELECT rowid, nom FROM ".MAIN_DB_PREFIX."groupart ORDER BY nom";
 
-    if ($this->db->query($sql) )
+    $result=$this->db->query($sql);
+    if ($result)
       {
-	$nump = $this->db->num_rows();
+	$nump = $this->db->num_rows($result);
 	
 	if ($nump)
 	  {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object($result);
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
@@ -185,6 +188,7 @@ class Groupart {
     else
       {
 	print $this->db->error();
+    return -1;
       }
     
   }
diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php
index 173fc73da4e..9f2289e0673 100644
--- a/htdocs/product/stock/liste.php
+++ b/htdocs/product/stock/liste.php
@@ -97,13 +97,13 @@ $result = $db->query($sql) ;
 
 if ($result)
 {
-  $num = $db->num_rows();
+  $num = $db->num_rows($result);
 
   $i = 0;
   
   if ($num == 1 && (isset($sall) or isset($snom) or isset($sref)))
     {
-      $objp = $db->fetch_object($i);
+      $objp = $db->fetch_object($result);
       Header("Location: fiche.php?id=$objp->rowid");
     }
   
@@ -143,7 +143,7 @@ if ($result)
   $var=True;
   while ($i < min($num,$limit))
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
       print "<TR $bc[$var]>";
       print "<TD><a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></TD>\n";
@@ -152,14 +152,14 @@ if ($result)
       print "</TR>\n";
       $i++;
     }
-  $db->free();
+  $db->free($result);
 
   print "</table>";
 
 }
 else
 {
-  print $db->error() . "<br>" .$sql;
+  dolibarr_print_error($db);
 }
 
 
diff --git a/htdocs/projet/project.class.php b/htdocs/projet/project.class.php
index 80cec296029..85ab3ebadee 100644
--- a/htdocs/projet/project.class.php
+++ b/htdocs/projet/project.class.php
@@ -141,21 +141,22 @@ class Project {
       $propales = array();
       $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."propal WHERE fk_projet=$this->id;";
       
-      if ($this->db->query($sql) )
+      $result=$this->db->query($sql);
+      if ($result)
 	{
-	  $nump = $this->db->num_rows();
+	  $nump = $this->db->num_rows($result);
 	  if ($nump)
 	    {
 	      $i = 0;
 	      while ($i < $nump)
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object($result);
 		  
 		  $propales[$i] = $obj->rowid;
 		  
 		  $i++;
 		}
-	      $this->db->free();
+	      $this->db->free($result);
 	      /*
 	       *  Retourne un tableau contenant la liste des propales associees
 	       */
@@ -164,7 +165,7 @@ class Project {
 	}
       else
 	{
-	  print $this->db->error() . '<br>' .$sql;
+	  dolibarr_print_error($this->db);
 	}
     }
   /*
@@ -177,21 +178,22 @@ class Project {
       $factures = array();
       $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE fk_projet=$this->id;";
       
-      if ($this->db->query($sql) )
+      $result=$this->db->query($sql);
+      if ($result)
 	{
-	  $nump = $this->db->num_rows();
+	  $nump = $this->db->num_rows($result);
 	  if ($nump)
 	    {
 	      $i = 0;
 	      while ($i < $nump)
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object($result);
 		  
 		  $factures[$i] = $obj->rowid;
 		  
 		  $i++;
 		}
-	      $this->db->free();
+	      $this->db->free($result);
 	      /*
 	       *  Retourne un tableau contenant la liste des factures associees
 	       */
@@ -200,7 +202,7 @@ class Project {
 	}
       else
 	{
-	  print $this->db->error() . '<br>' .$sql;
+	  dolibarr_print_error($this->db);
 	}
     }
   /**
@@ -213,21 +215,22 @@ class Project {
       $commandes = array();
       $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande WHERE fk_projet=$this->id;";
       
-      if ($this->db->query($sql) )
+      $result=$this->db->query($sql);
+      if ($result)
 	{
-	  $nump = $this->db->num_rows();
+	  $nump = $this->db->num_rows($result);
 	  if ($nump)
 	    {
 	      $i = 0;
 	      while ($i < $nump)
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object($result);
 		  
 		  $commandes[$i] = $obj->rowid;
 		  
 		  $i++;
 		}
-	      $this->db->free();
+	      $this->db->free($result);
 	      /*
 	       *  Retourne un tableau contenant la liste des commandes associees
 	       */
@@ -236,7 +239,7 @@ class Project {
 	}
       else
 	{
-	  print $this->db->error() . '<br>' .$sql;
+	  dolibarr_print_error($this->db);
 	}
     }