diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php
index 96f3eb133a0..360bb5760ff 100644
--- a/htdocs/adherents/adherent.class.php
+++ b/htdocs/adherents/adherent.class.php
@@ -433,7 +433,7 @@ class Adherent
       {
 	if ($this->db->num_rows())
 	  {
-	    $obj = $this->db->fetch_object(0);
+	    $obj = $this->db->fetch_object();
 	    $this->fetch($obj->rowid);
 	  }
       }
@@ -461,7 +461,7 @@ class Adherent
 	if ($this->db->num_rows())
 	  {
 
-	    $obj = $this->db->fetch_object(0);
+	    $obj = $this->db->fetch_object();
 
 	    $this->id             = $obj->rowid;
 	    $this->typeid         = $obj->fk_adherent_type;
@@ -508,7 +508,6 @@ class Adherent
     if ( $this->db->query( $sql) ){
 	if ($this->db->num_rows()){
 	  
-	  //$obj = $this->db->fetch_object(0);
 	  $tab = $this->db->fetch_array();
 	  
 	  foreach ($tab as $key => $value){
@@ -534,7 +533,6 @@ class Adherent
 
     if ( $this->db->query( $sql) ){
       if ($this->db->num_rows()){
-	//$tab = $this->db->fetch_object();
 	//$array_name_options[]=$tab->Field;
 	while ($tab = $this->db->fetch_object()){
 	  if ($tab->Field != 'optid' && $tab->Field != 'tms' && $tab->Field != 'adhid'){
diff --git a/htdocs/adherents/adherent_type.class.php b/htdocs/adherents/adherent_type.class.php
index d5cf0845061..2bb87de7703 100644
--- a/htdocs/adherents/adherent_type.class.php
+++ b/htdocs/adherents/adherent_type.class.php
@@ -167,7 +167,7 @@ class AdherentType
 	if ($this->db->num_rows())
 	  {
 
-	    $obj = $this->db->fetch_object(0);
+	    $obj = $this->db->fetch_object();
 
 	    $this->id             = $obj->rowid;
 	    $this->libelle        = $obj->libelle;
@@ -200,7 +200,7 @@ class AdherentType
 	      $i = 0;
 	      while ($i < $nump)
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object();
 
 		  $projets[$obj->rowid] = $obj->libelle;
 		  $i++;
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 796e7128b11..42b0548898a 100755
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -82,7 +82,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       // attribut a remplacer
       $replace = array (
 			ucfirst(strtolower($objp->prenom)),
diff --git a/htdocs/adherents/cartes/etiquette.php b/htdocs/adherents/cartes/etiquette.php
index edc9594d283..7c19ca11a23 100755
--- a/htdocs/adherents/cartes/etiquette.php
+++ b/htdocs/adherents/cartes/etiquette.php
@@ -70,7 +70,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       // imprime le texte specifique sur la carte
       $pdf->Add_PDF_card(sprintf("%s\n%s\n%s %s\n%s", ucfirst(strtolower($objp->prenom))." ".strtoupper($objp->nom), ucwords(strtolower($objp->adresse)), $objp->cp, strtoupper($objp->ville), ucfirst(strtolower($objp->pays))),'','');
       $i++;
diff --git a/htdocs/adherents/cotisation.class.php b/htdocs/adherents/cotisation.class.php
index 686d2ff11b0..9700686c8af 100644
--- a/htdocs/adherents/cotisation.class.php
+++ b/htdocs/adherents/cotisation.class.php
@@ -289,7 +289,7 @@ class Cotisation
 	if ($this->db->num_rows())
 	  {
 
-	    $obj = $this->db->fetch_object(0);
+	    $obj = $this->db->fetch_object();
 
 	    $this->id             = $obj->rowid;
 	    $this->date           = $obj->datedon;
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 79bced4cccb..dc2b95c8b11 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -62,13 +62,13 @@ if ($_POST["action"] == '2bank' && $_POST["rowid"] !=''){
 	$num = $db->num_rows();
 	if ($num>0)
 	  {
-	    $objp = $db->fetch_object(0);
+	    $objp = $db->fetch_object($result);
 	    $amount=$objp->cotisation;
 	    $acct=new Account($db,ADHERENT_BANK_ACCOUNT);
 	    $insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE);
 	    if ($insertid == '')
 	      {
-		print "<p> Probleme d'insertion : ".$db->error();
+		   dolibarr_print_error($db);
 	      }
 	    else
 	      {
@@ -81,20 +81,19 @@ if ($_POST["action"] == '2bank' && $_POST["rowid"] !=''){
 		  }
 		else
 		  {
-		   print "<p> Probleme d'insertion $sql : ".$db->error(); 
+		   dolibarr_print_error($db);
 		  }
 	      }
 	  }
 	else
 	  {
-	    print "<p>  Probleme SQL : $sql : ".$db->error(); 
+		   dolibarr_print_error($db);
 	  }
       }
     else
       {
-	print "<p>  Probleme SQL : $sql : ".$db->error();
+		   dolibarr_print_error($db);
       }
-	
     
   }
 }
@@ -123,7 +122,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $Total[strftime("%Y",$objp->dateadh)]+=price($objp->cotisation);
       $Number[strftime("%Y",$objp->dateadh)]+=1;
       $i++;
@@ -145,77 +144,64 @@ if ($result)
   
   print_barre_liste("Liste des cotisations", $page, "cotisations.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield");
 
-  print "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"4\">\n";
-  print '<TR class="liste_titre">';
+  print "<table class=\"noborder\">\n";
+  print '<tr class="liste_titre">';
   print "<td>Annee</td>";
-  print '<td align="right">Montant</TD>';
-  print "<td align=\"right\">Nombre</TD>";
-  print "<td align=\"right\">Moyenne</TD>\n";
-  print "</TR>\n";
+  print '<td align="right">Montant</td>';
+  print "<td align=\"right\">Nombre</td>";
+  print "<td align=\"right\">Moyenne</td>\n";
+  print "</tr>\n";
 
   foreach ($Total as $key=>$value){
     $var=!$var;
-    print "<TR $bc[$var]><TD><A HREF=\"cotisations.php?statut=$statut&date_select=$key\">$key</A></TD><TD align=\"right\">".price($value)."</TD><TD align=\"right\">".$Number[$key]."</TD><TD align=\"right\">".price($value/$Number[$key])."</TD></TR>\n";
+    print "<tr $bc[$var]><td><A HREF=\"cotisations.php?statut=$statut&date_select=$key\">$key</A></TD><TD align=\"right\">".price($value)."</TD><TD align=\"right\">".$Number[$key]."</TD><TD align=\"right\">".price($value/$Number[$key])."</TD></TR>\n";
   }
-  print "</table><BR>\n";
+  print "</table><br>\n";
 
-  print "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"4\">";
+  print "<table class=\"border\">";
 
-  print '<TR class="liste_titre">';
-  //print "<td>Date</td>";
-  print '<TD>';
+  print '<tr class="liste_titre">';
+  print '<td>';
   print_liste_field_titre("Date<BR>","cotisations.php","c.dateadh","&page=$page&statut=$statut");
-  print "</TD>\n";
+  print "</td>\n";
 
-  //print "<td align=\"right\">Montant</TD>";
-  print '<TD>';
+  print '<td>';
   print_liste_field_titre("Montant<BR>","cotisations.php","c.cotisation","&page=$page&statut=$statut");
-  print "</TD>\n";
+  print "</td>\n";
 
-  //print "<td>Prenom Nom / Société</td>";
-  print '<TD>';
-  //  print_liste_field_titre("Prenom","cotisations.php","d.prenom","&page=$page&statut=$statut");
+  print '<td>';
   print_liste_field_titre("Prenom Nom<BR>","cotisations.php","d.nom","&page=$page&statut=$statut");
-  //  print " / Société";
-  print "</TD>\n";
+  print "</td>\n";
 
   if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){
-    print '<TD>';
+    print '<td>';
     //  print_liste_field_titre("Bank","cotisations.php","c.fk_bank","&page=$page&statut=$statut");
-    print 'Bank<BR>(Type,Numéro,Libelle)';
-    print "</TD>\n";
+    print 'Bank<br>(Type,Numéro,Libelle)';
+    print "</td>\n";
   }
-  print "</TR>\n";
+  print "</tr>\n";
     
   $var=True;
   $total=0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
-      print "<TR $bc[$var]>";
-      print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".strftime("%d %B %Y",$objp->dateadh)."</a></td>\n";
-      print '<TD align="right">'.price($objp->cotisation).'</TD>';
-      //$Total[strftime("%Y",$objp->dateadh)]+=price($objp->cotisation);
+      print "<tr $bc[$var]>";
+      print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".strftime("%d %B %Y",$objp->dateadh)."</a></td>\n";
+      print '<td align="right">'.price($objp->cotisation).'</td>';
       $total+=price($objp->cotisation);
-      /*
-      if ($objp->societe != ''){
-	print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." /<BR>".stripslashes($objp->societe)."</a></TD>\n";
-      }else{
-	print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></TD>\n";
-      }
-      */
-      print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></TD>\n";
+      print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></TD>\n";
       if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){
 	if ($objp->bank !='' ){
-	  print "<TD>Deposé</TD>";
+	  print "<td>Deposé</td>";
 	}else{
-	  print "<TD>";
+	  print "<td>";
 	  print "<form method=\"post\" action=\"cotisations.php\">";
 	  print '<input type="hidden" name="action" value="2bank">';
 	  print '<input type="hidden" name="rowid" value="'.$objp->crowid.'">';
 	  print '<select name="operation">';
-	  print '<option value="CHQ" SELECTED>CHQ';
+	  print '<option value="CHQ" selected>CHQ';
 	  print '<option value="CB">CB';
 	  print '<option value="DEP">DEP';
 	  print '<option value="TIP">TIP';
@@ -228,7 +214,7 @@ if ($result)
 	  //	print "<td><input name=\"credit\" type=\"text\" size=8></td>";
 	  print '<input type="submit" value="Dépot">';
 	  print "</form>\n";
-	  print "</TD>\n";
+	  print "</td>\n";
 	}	  
       }
       print "</tr>";
@@ -250,8 +236,7 @@ if ($result)
 }
 else
 {
-  print $sql;
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 
diff --git a/htdocs/adherents/edit.php b/htdocs/adherents/edit.php
index 8753985a704..a0e1bf929f5 100644
--- a/htdocs/adherents/edit.php
+++ b/htdocs/adherents/edit.php
@@ -116,7 +116,7 @@ if ($rowid)
   if ($result) {
     $num = $db->num_rows();
     if ($num) {
-      $obj = $db->fetch_object( 0);
+      $obj = $db->fetch_object($result);
 
       $total = $obj->total;
     }
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 696845fbf08..131073f6a64 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -650,7 +650,7 @@ if ($result)
     $var=True;
     while ($i < $num)
     {
-        $objp = $db->fetch_object( $i);
+        $objp = $db->fetch_object($result);
         $var=!$var;
         print "<tr $bc[$var]>";
         print "<td>".dolibarr_print_date($objp->dateadh)."</td>\n";
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 8ec62c86da2..1670134687d 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -64,7 +64,7 @@ if ($result)
   print "<HR>\n";
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $htpass=crypt($objp->pass,initialiser_sel());
       print $objp->login.":".$htpass."<BR>\n";
       $i++;
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9eb7468cba3..c61f6d0c5af 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -70,7 +70,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $AdherentsAll[$objp->libelle]=$objp->rowid; 
       if ($objp->statut == -1) { $AdherentsAValider[$objp->libelle]=$objp->somme; }
       if ($objp->statut == 1) { $Adherents[$objp->libelle]=$objp->somme; }
@@ -93,7 +93,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $Cotisants[$objp->libelle]=$objp->somme;
       $i++;
     }
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index e097d21f574..93a239a8900 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -85,7 +85,7 @@ if ($result)
   }
 
   if ($_GET["type"]) {
-      $objp = $db->fetch_object(0);
+      $objp = $db->fetch_object($result);
       $titre.=" (".$objp->type.")";
   }
 
@@ -127,7 +127,7 @@ if ($result)
     {
       if ($_GET["type"] && $i==0) { # Fetch deja fait
       } else {
-        $objp = $db->fetch_object($i);
+        $objp = $db->fetch_object($result);
       }
       
       $adh=new Adherent($db);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4989d21688f..e00bf11a169 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -109,7 +109,7 @@ if ($result)
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td>".$objp->rowid."</td>\n";
diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php
index 6c5cd35e711..391af735737 100644
--- a/htdocs/admin/adherent.php
+++ b/htdocs/admin/adherent.php
@@ -245,8 +245,7 @@ function form_constantes($tableau){
   print '<td>'.$langs->trans("Description").'</td>';
   print '<td>'.$langs->trans("Value").'</td>';
   print '<td>'.$langs->trans("Type").'</td>';
-  //print '<td>Note</td>';
-  print "<td>Action</td>";
+  print '<td>'.$langs->trans("Action").'</td>';
   print "</tr>\n";
   $var=True;
   
@@ -254,7 +253,7 @@ function form_constantes($tableau){
     $sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const WHERE name='$const'";
     $result = $db->query($sql);
     if ($result && ($db->num_rows() == 1)) {
-      $obj = $db->fetch_object(0);
+      $obj = $db->fetch_object($result);
       $var=!$var;
       print '<form action="adherent.php" method="POST">';
       print '<input type="hidden" name="action" value="update">';
diff --git a/htdocs/admin/boutique-special-all.php b/htdocs/admin/boutique-special-all.php
index 49ccc5cd432..32a3eaa9984 100644
--- a/htdocs/admin/boutique-special-all.php
+++ b/htdocs/admin/boutique-special-all.php
@@ -51,7 +51,7 @@ if ( $db->query($sql) )
   $i = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
 
     $livre = new Livre($db);
     if ($livre->fetch($objp->rowid))
diff --git a/htdocs/admin/boutique-update-all.php b/htdocs/admin/boutique-update-all.php
index 48f1ce95cf8..d38eab32392 100644
--- a/htdocs/admin/boutique-update-all.php
+++ b/htdocs/admin/boutique-update-all.php
@@ -50,7 +50,7 @@ if ( $db->query($sql) )
   $i = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
 
     $livre = new Livre($db);
     if ($livre->fetch($objp->rowid))
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index cbc2c0fade8..bb07ac9cb48 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -84,7 +84,7 @@ if ($result)
   while ($i < $num)
     {
       $var = ! $var;
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       //print "pos ".$obj->position;
       $boxes[$obj->position][$obj->box_id]=1;
       $i++;
@@ -121,7 +121,7 @@ if ($result)
     while ($i < $num)
     {
         $var = ! $var;
-        $obj = $db->fetch_object( $i);
+        $obj = $db->fetch_object($result);
         
         print '<form action="boxes.php" method="POST">';
         print '<tr '.$bc[$var].'><td>'.$obj->name.'</td><td>' . $obj->file . '</td>';
@@ -171,7 +171,7 @@ if ($result)
   while ($i < $num)
     {
       $var = ! $var;
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
 
       print '<tr '.$bc[$var].'><td>'.$obj->name.'</td>';
       print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 1e88a605df7..610283b5132 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -113,7 +113,7 @@ if ($result)
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       print '<form action="compta.php" method="POST">';
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 38b89122d41..2d429dda160 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -115,7 +115,7 @@ if ($result)
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       print '<form action="const.php" method="POST">';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 062a2d1f18a..af2ac1ca202 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -148,7 +148,7 @@ if ($_POST["actionadd"]) {
             $result = $db->query($sql);
             if ($result)
             {
-                $obj = $db->fetch_object(0);
+                $obj = $db->fetch_object($result);
                 $newid=($obj->newid + 1);
                         
             } else {
@@ -369,7 +369,7 @@ if ($_GET["id"])
             // Lignes de valeurs
             while ($i < $num)
             {
-                $obj = $db->fetch_object($i);
+                $obj = $db->fetch_object();
                 $var=!$var;
 
                 print "<tr $bc[$var] class=\"value\">";
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7632c17aa15..2523d5a90a9 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -42,8 +42,8 @@ if (!$user->admin)
 $def = array();
 
 // positionne la variable pour le nombre de rss externes
-$db->query("select count(*) nb from ".MAIN_DB_PREFIX."const WHERE name like 'EXTERNAL_RSS_URLRSS_%'");
-$obj = $db->fetch_object(0);
+$result=$db->query("select count(*) nb from ".MAIN_DB_PREFIX."const WHERE name like 'EXTERNAL_RSS_URLRSS_%'");
+$obj = $db->fetch_object($result);
 $nbexternalrss = $obj->nb;
 
 if ($_POST["action"] == 'add')
diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
index e59d6875ebd..33c9bfae467 100644
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.php
@@ -74,7 +74,7 @@ if ( $db->query($sql) ) {
 
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
     $var=!$var;
     print "<TR $bc[$var]>";
     print "<TD>$objp->languages_id</TD>\n";
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index e3af7e46aaa..41c5b0dcf52 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -70,7 +70,7 @@ if ($result)
   $old = "";
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       if ($old <> $obj->module)
diff --git a/htdocs/admin/sqltables.php b/htdocs/admin/sqltables.php
index 8c7a985bcc9..b7a680ce5bd 100644
--- a/htdocs/admin/sqltables.php
+++ b/htdocs/admin/sqltables.php
@@ -39,11 +39,11 @@ print_barre_liste("Liste des tables", $page, "sqltables.php");
 
 $sql = "SELECT name, loaded FROM ".MAIN_DB_PREFIX."sqltables";
 
-print "<table class=\noboirder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">";
+print "<table class=\"noborder\" width=\"100%\">";
 print '<tr class="liste_titre">';
-print "<td>Nom</td>";
+print '<td>'.$langs->trans("Name").'</td>';
 print '<td align="center">Chargée</td>';
-print '<td align="center">Action</td>';
+print '<td align="center">'.$langs->trans("Action").'</td>';
   print "</tr>\n";
  
 if ( $db->query($sql) ) {
@@ -52,7 +52,7 @@ if ( $db->query($sql) ) {
 
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
     $var=!$var;
     print "<tr $bc[$var]>";
     print "<td>$objp->name</td>\n";
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 01ae18c1e71..a35b41ca13f 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -55,7 +55,7 @@ if ($result)
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       print "<tr $bc[$var]><td>$obj->name</td>\n";
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 7f078fcd317..449e9c51d2e 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -67,7 +67,7 @@ if ($result)
   $var=True;
   while ($i < $num)
     {
-        $objp = $db->fetch_object( $i);
+        $objp = $db->fetch_object($result);
         $var=!$var;
         print "<tr $bc[$var]>";
         if ($base==1)
diff --git a/htdocs/admin/update/paiement.php b/htdocs/admin/update/paiement.php
index 3156cad5daa..87f67d6bcbd 100644
--- a/htdocs/admin/update/paiement.php
+++ b/htdocs/admin/update/paiement.php
@@ -44,7 +44,7 @@ if ($result)
   
   while ($i < $num)
     {
-      $obj = $db->fetch_object($result , $i);
+      $obj = $db->fetch_object($result);
       $row[$i][0] = $obj->rowid ;
       $row[$i][1] = $obj->fk_facture;
       $row[$i][2] = $obj->amount;
diff --git a/htdocs/boutique/auteur/auteur.class.php b/htdocs/boutique/auteur/auteur.class.php
index 9bc3879b7ba..2c9f8ed7ce4 100644
--- a/htdocs/boutique/auteur/auteur.class.php
+++ b/htdocs/boutique/auteur/auteur.class.php
@@ -83,7 +83,7 @@ class Auteur {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
diff --git a/htdocs/boutique/auteur/index.php b/htdocs/boutique/auteur/index.php
index c559fc57ad6..d1fb5624be5 100644
--- a/htdocs/boutique/auteur/index.php
+++ b/htdocs/boutique/auteur/index.php
@@ -46,26 +46,26 @@ $sql .= $db->plimit( $limit ,$offset);
 if ( $db->query($sql) ) {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
+  print "<table class=\"noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre("Nom","index.php", "e.nom");
   print "</td>";
-  print "</TR>\n";
+  print "</tr>\n";
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
     $var=!$var;
-    print "<TR $bc[$var]>";
-    print "<TD width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->nom</a></TD>\n";
-    print "</TR>\n";
+    print "<tr $bc[$var]>";
+    print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->nom</a></td>\n";
+    print "</tr>\n";
     $i++;
   }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php
index 5c6100b610b..9c4a3f21442 100644
--- a/htdocs/boutique/client/fiche.php
+++ b/htdocs/boutique/client/fiche.php
@@ -73,34 +73,34 @@ if ($action == 'update' && !$cancel) {
 	    {
 	      $num = $db->num_rows();
 	      $i = 0;
-	      print '<p><TABLE border="0" width="50%" cellspacing="0" cellpadding="4">';
-	      print "<TR class=\"liste_titre\"><td>Commandes</td>";
+	      print '<table class="noborder" width="50%">';
+	      print "<tr class=\"liste_titre\"><td>Commandes</td>";
 	      print "</tr>\n";
 	      $var=True;
 	      while ($i < $num) {
-		$objp = $db->fetch_object( $i);
+		$objp = $db->fetch_object();
 		$var=!$var;
-		print "<TR $bc[$var]>";
+		print "<tr $bc[$var]>";
 		
 		print '<td><a href="'.DOL_URL_ROOT.'/boutique/commande/fiche.php?id='.$objp->orders_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche"></a>&nbsp;';
 		
 		print "<a href=\"".DOL_URL_ROOT."/boutique/commande/fiche.php?id=$objp->orders_id\">".strftime("%d %B %Y",$objp->date_purchased)."</a></TD>\n";
 		
-		print "</TR>\n";
+		print "</tr>\n";
 		$i++;
 	      }
-	      print "</TABLE>";
+	      print "</table>";
 	      $db->free();
 	    }
 	  else
 	    {
-	      print $db->error();
+	      dolibarr_print_error($db);
 	    }
 	  
 	}
       else
 	{
-	  print "Fetch failed";
+	      dolibarr_print_error($db);
 	}
     
 
@@ -117,14 +117,7 @@ if ($action == 'update' && !$cancel) {
 /*                                                                            */ 
 /* ************************************************************************** */
 
-print '<br><table width="100%" border="1" cellspacing="0" cellpadding="3">';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';    
-print '<td width="20%" align="center">-</td>';    
-print '</table><br>';
-
+// Pas d'action
 
 
 $db->close();
diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php
index a8926bb4a90..1d514447a53 100644
--- a/htdocs/boutique/client/index.php
+++ b/htdocs/boutique/client/index.php
@@ -22,6 +22,8 @@
 
 require("./pre.inc.php");
 
+$langs->load("companies");
+
 llxHeader();
 
 if ($sortfield == "") {
@@ -47,32 +49,32 @@ if ( $db->query($sql) )
 {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
-  print_liste_field_titre("Prénom","index.php", "c.customers_firstname");
+  print "<table class=\"noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
+  print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname");
   print "</td><td>";
-  print_liste_field_titre("Nom","index.php", "c.customers_lastname");
-  print '</td><td>Email</td><td align="center">Newsletter</td>';
-  print "</TR>\n";
+  print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname");
+  print '</td><td>'.$langs->trans("EMail").'</td><td align="center">Newsletter</td>';
+  print "</tr>\n";
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
-      print "<TR $bc[$var]>";
-      print '<TD><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></TD>\n";
-      print '<TD><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></TD>\n";
-      print "<TD>$objp->customers_email_address</TD>\n";
-      print "<TD align=\"center\">$objp->customers_newsletter</TD>\n";
-      print "</TR>\n";
+      print "<tr $bc[$var]>";
+      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></TD>\n";
+      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></TD>\n";
+      print "<td>$objp->customers_email_address</TD>\n";
+      print "<td align=\"center\">$objp->customers_newsletter</TD>\n";
+      print "</tr>\n";
       $i++;
     }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php
index 2c1f79c839a..d89ff792ac7 100644
--- a/htdocs/boutique/commande/ca.php
+++ b/htdocs/boutique/commande/ca.php
@@ -55,7 +55,7 @@ if ( $db->query($sql) )
   $var=True;
   if ($num > 0)
     {
-      $objp = $db->fetch_object(0);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print '<td>Somme des commandes</td>';
@@ -69,7 +69,7 @@ if ( $db->query($sql) )
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $sql = "SELECT sum(t.value) as value";
@@ -83,7 +83,7 @@ if ( $db->query($sql) )
   $var=True;
   if ($num > 0)
     {
-      $objp = $db->fetch_object(0);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print '<td>Somme des frais de port</td>';
@@ -95,7 +95,7 @@ if ( $db->query($sql) )
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index 50ea1e20847..d3eb16ec420 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -24,6 +24,8 @@
 
 require("./pre.inc.php");
 
+$langs->load("products");
+
 llxHeader();
 
 /*
@@ -70,30 +72,30 @@ if ($id)
 	{
 	  $num = $db->num_rows();
 	  $i = 0;
-	  print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
-	  print '<tr class="liste_titre"><td align="left" width="40%">Produits</td>';
+	  print '<table class="noborder" width="100%">';
+	  print '<tr class="liste_titre"><td align="left" width="40%">'.$langs->trans("Products").'</td>';
 	  print '<td align="center">'.$langs->trans("Number").'</td><td align="right">'.$langs->trans("Price").'</td><td align="right">Prix final</td>';
 	  print "</tr>\n";
 	  $var=True;
 	  while ($i < $num) 
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 	      $var=!$var;
-	      print "<TR $bc[$var]>";
+	      print "<tr $bc[$var]>";
 	      print '<td align="left" width="40%">';
 	      print '<a href="fiche.php?id='.$objp->rowid.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" width="16" height="16" alt="Fiche livre"></a>';
 	    
 	      print '<a href="fiche.php?id='.$objp->rowid.'">'.$objp->products_name.'</a>';
 	      print "</td>";
 
-	      print '<TD align="center"><a href="fiche.php?id='.$objp->rowid."\">$objp->products_quantity</a></TD>\n";
-	      print "<TD align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->products_price)."</a></TD>\n";
-	      print "<TD align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->final_price)."</a></TD>\n";
+	      print '<td align="center"><a href="fiche.php?id='.$objp->rowid."\">$objp->products_quantity</a></TD>\n";
+	      print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->products_price)."</a></TD>\n";
+	      print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->final_price)."</a></TD>\n";
 	    
-	      print "</TR>\n";
+	      print "</tr>\n";
 	      $i++;
 	    }
-	  print "</TABLE>";
+	  print "</table>";
 	  $db->free();
 	}
       else
diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php
index 45c5a8dfd80..9d9abca8946 100644
--- a/htdocs/boutique/commande/index.php
+++ b/htdocs/boutique/commande/index.php
@@ -59,7 +59,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
 
@@ -76,7 +76,7 @@ if ( $db->query($sql) )
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/editeur/editeur.class.php b/htdocs/boutique/editeur/editeur.class.php
index d70ae62708b..213fcfc372b 100644
--- a/htdocs/boutique/editeur/editeur.class.php
+++ b/htdocs/boutique/editeur/editeur.class.php
@@ -70,7 +70,7 @@ class Editeur {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
@@ -152,7 +152,7 @@ class Editeur {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->title;
 		$i++;
diff --git a/htdocs/boutique/editeur/index.php b/htdocs/boutique/editeur/index.php
index 4fb2f384c50..e7515030050 100644
--- a/htdocs/boutique/editeur/index.php
+++ b/htdocs/boutique/editeur/index.php
@@ -46,18 +46,18 @@ $sql .= $db->plimit( $limit ,$offset);
 if ( $db->query($sql) ) {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
+  print "<table class=\"noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre("Nom","index.php", "e.nom");
   print "</td>";
-  print "</TR>\n";
+  print "</tr>\n";
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
     $var=!$var;
-    print "<TR $bc[$var]>";
-    print "<TD width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->nom</a></TD>\n";
-    print "</TR>\n";
+    print "<tr $bc[$var]>";
+    print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->nom</a></td>\n";
+    print "</tr>\n";
     $i++;
   }
   print "</TABLE>";
diff --git a/htdocs/boutique/livre/index.php b/htdocs/boutique/livre/index.php
index 90fc1adefb8..9bde3d09fae 100644
--- a/htdocs/boutique/livre/index.php
+++ b/htdocs/boutique/livre/index.php
@@ -61,19 +61,19 @@ if ( $db->query($sql) )
 {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
+  print "<table class=\"noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre($langs->trans("Ref"),"index.php", "l.ref");
   print "</td><td>";
   print_liste_field_titre("Titre","index.php", "l.title");
   print "</td>";
   print '<td colspan="3">&nbsp;</td>';
-  print "</TR>\n";
+  print "</tr>\n";
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
     $var=!$var;
-    print "<TR $bc[$var]>";
+    print "<tr $bc[$var]>";
 
     print '<td><a href="fiche.php?id='.$objp->rowid.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche livre"></a>&nbsp;';
 
@@ -85,7 +85,7 @@ if ( $db->query($sql) )
       {
 	print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_green.png" border="0"></a></td>';
 	print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_red_light.png" border="0"></a></td>';
-	print '<TD align="right"><a href="'.OSC_CATALOG_URL.'product_info.php?products_id='.$objp->oscid.'">Fiche en ligne</a></TD>';
+	print '<td align="right"><a href="'.OSC_CATALOG_URL.'product_info.php?products_id='.$objp->oscid.'">Fiche en ligne</a></TD>';
       }
     else
       {
@@ -94,15 +94,15 @@ if ( $db->query($sql) )
 	print '<td>&nbsp;</td>';
       }
 
-    print "</TR>\n";
+    print "</tr>\n";
     $i++;
   }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/livre/livre.class.php b/htdocs/boutique/livre/livre.class.php
index 7d95ce31d5e..1db954c693f 100644
--- a/htdocs/boutique/livre/livre.class.php
+++ b/htdocs/boutique/livre/livre.class.php
@@ -145,7 +145,7 @@ class Livre {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
@@ -247,7 +247,7 @@ class Livre {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);	       
+		$obj = $this->db->fetch_object();	       
 		$pcat[$i] = $obj->categories_id;
 		$i++;
 	      }
diff --git a/htdocs/boutique/livre/vignettes.php b/htdocs/boutique/livre/vignettes.php
index ec2081a56a5..60ef7d03fca 100644
--- a/htdocs/boutique/livre/vignettes.php
+++ b/htdocs/boutique/livre/vignettes.php
@@ -60,33 +60,33 @@ if ( $db->query($sql) )
 {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
+  print "<table class=\"noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre($langs->trans("Ref"),"vignettes.php", "l.ref");
   print "</td><td>";
   print_liste_field_titre("Titre","vignettes.php", "l.title");
   print "</td>";
   print '<td colspan="3">&nbsp;</td>';
-  print "</TR>\n";
+  print "</tr>\n";
   $var=True;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object();
 
     if(! file_exists(OSC_CATALOG_DIRECTORY."images/".$objp->ref.".jpg"))
       {
 	$var=!$var;
-	print "<TR $bc[$var]>";
+	print "<tr $bc[$var]>";
 	print '<td><a href="fiche.php?id='.$objp->rowid.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche livre"></a>&nbsp;';
 	
 	print "<a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></TD>\n";
-	print "<TD width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->title</a></TD>\n";
+	print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->title</a></TD>\n";
 
 
 	if ($objp->status == 1)
 	  {
 	    print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_green.png" border="0"></a></td>';
 	    print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_red_light.png" border="0"></a></td>';
-	    print '<TD align="right"><a href="'.OSC_CATALOG_URL.'product_info.php?products_id='.$objp->oscid.'">Fiche en ligne</a></TD>';
+	    print '<td align="right"><a href="'.OSC_CATALOG_URL.'product_info.php?products_id='.$objp->oscid.'">Fiche en ligne</a></TD>';
 	    
 	  }
 	else
@@ -96,17 +96,17 @@ if ( $db->query($sql) )
 	    print '<td>&nbsp;</td>';
 	  }
 	
-	print "</TR>\n";
+	print "</tr>\n";
 
       }
     $i++;
   }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/newsletter/fiche.php b/htdocs/boutique/newsletter/fiche.php
index bb9715e7117..c018fc1348d 100644
--- a/htdocs/boutique/newsletter/fiche.php
+++ b/htdocs/boutique/newsletter/fiche.php
@@ -21,9 +21,15 @@
  *
  */
 
+/*! \file htdocs/boutique/newsletter/fiche.php
+        \ingroup    boutique
+		\brief      Fiche newsletter
+		\version    $Revision$
+*/
+
 require("./pre.inc.php");
 
-if ($action == 'add') {
+if ($_POST["action"] == 'add') {
   $newsletter = new Newsletter($db);
 
   $newsletter->email_subject    = $_POST["email_subject"];
@@ -35,13 +41,13 @@ if ($action == 'add') {
   $id = $newsletter->create($user);
 }
 
-if ($action == 'addga') {
+if ($_POST["action"] == 'addga') {
   $newsletter = new Newsletter($db);
 
   $newsletter->linkga($id, $ga);
 }
 
-if ($action == 'update' && !$cancel)
+if ($_POST["action"] == 'update' && !$cancel)
 {
   $newsletter = new Newsletter($db);
 
diff --git a/htdocs/boutique/newsletter/index.php b/htdocs/boutique/newsletter/index.php
index 79594ca1fce..7a89763c0e0 100644
--- a/htdocs/boutique/newsletter/index.php
+++ b/htdocs/boutique/newsletter/index.php
@@ -47,7 +47,7 @@ if ( $db->query($sql) )
 {
   $num = $db->num_rows();
   $i = 0;
-  print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">";
+  print "<table class=\"noborder\" width=\"100%\">";
   print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre("Sujet","index.php", "email_subject");
   print "</td>";
@@ -57,7 +57,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
 
diff --git a/htdocs/boutique/newsletter/newsletter.class.php b/htdocs/boutique/newsletter/newsletter.class.php
index 3ee5ee32647..806d18c449b 100644
--- a/htdocs/boutique/newsletter/newsletter.class.php
+++ b/htdocs/boutique/newsletter/newsletter.class.php
@@ -151,7 +151,7 @@ class Newsletter {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php
index 6814e4a3b9d..6692f282c88 100644
--- a/htdocs/boutique/notification/index.php
+++ b/htdocs/boutique/notification/index.php
@@ -51,29 +51,29 @@ if ( $db->query($sql) )
 {
   $num = $db->num_rows();
   $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\"><td>";
+  print "<table class=\noborder\" width=\"100%\">";
+  print "<tr class=\"liste_titre\"><td>";
   print_liste_field_titre("Client","index.php", "c.customers_lastname");
   print "</td>";
   print "<td>Produit</td>";
-  print "</TR>\n";
+  print "</tr>\n";
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
-      print "<TR $bc[$var]>";
-      print "<TD width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->customers_firstname $objp->customers_lastname</a></TD>\n";
+      print "<tr $bc[$var]>";
+      print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->customers_firstname $objp->customers_lastname</a></TD>\n";
       print '<td><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_name."</a></td>";
-      print "</TR>\n";
+      print "</tr>\n";
       $i++;
     }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/boutique/notification/notification.class.php b/htdocs/boutique/notification/notification.class.php
index ffa990a604b..8df613ce97c 100644
--- a/htdocs/boutique/notification/notification.class.php
+++ b/htdocs/boutique/notification/notification.class.php
@@ -70,7 +70,7 @@ class Editeur {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->nom;
 		$i++;
diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php
index 23e73d52c22..85e7be9e37e 100644
--- a/htdocs/boutique/notification/produits.php
+++ b/htdocs/boutique/notification/produits.php
@@ -59,7 +59,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<TR $bc[$var]>";
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 5645b92a8b8..e68343b804f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -159,7 +159,7 @@ if ( $db->query($sql) )
       print_barre_liste("Liste des actions commerciales réalisées ou à faire", $page, "index.php",'',$sortfield,$sortorder,'',$num);
     }
   $i = 0;
-  print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">";
+  print "<table class=\"noborder\" width=\"100%\">";
   print '<tr class="liste_titre">';
   print '<td colspan="4">'.$langs->trans("Date").'</td>';
   print '<td>Avancement</td>';
@@ -168,10 +168,10 @@ if ( $db->query($sql) )
   print '<td>Contact</Td>';
   print "<td>".$langs->trans("Comments")."</td><td>".$langs->trans("Author")."</td>";
   print "</tr>\n";
-  $var=True;
+  $var=true;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       
       $var=!$var;
     
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 7e68bb19346..59f69ee650c 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -156,16 +156,16 @@ if ( $db->query($sql) )
   print '<td align="center">Date</td>';
   print '<td align="center">Taille</td>';
   print "</tr>\n";
-  $var=True;
+  $var=true;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       
       $var=!$var;
     
-      print "<TR $bc[$var]>";
+      print "<tr $bc[$var]>";
 
-      print "<td>$obj->df</TD>\n";
+      print "<td>$obj->df</td>\n";
       print '<td align="center">'.$obj->cc.'</td>';
 
       print '<td><a href="index.php?action=pdf&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_file_new().'</a></td>';
diff --git a/htdocs/comm/action/rapport/rapport.pdf.php b/htdocs/comm/action/rapport/rapport.pdf.php
index 109f8c4c7d9..f183d755224 100644
--- a/htdocs/comm/action/rapport/rapport.pdf.php
+++ b/htdocs/comm/action/rapport/rapport.pdf.php
@@ -153,7 +153,7 @@ class CommActionRapport {
 	  $y2 = 0;
 	  while ($i < $num)
 	    {
-	      $obj = $this->db->fetch_object($i);
+	      $obj = $this->db->fetch_object();
 	      $y = max($pdf->GetY(), $y1, $y2) + 1;
 	      $pdf->SetFont('Arial','',10);
 
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 871e46bf1f8..4dde08f0506 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -23,6 +23,9 @@
 require("./pre.inc.php");
 require("./propal_model_pdf.class.php");
 
+$langs->load("projects");
+
+
 $user->getrights('propale');
 $user->getrights('fichinter');
 $user->getrights('commande');
@@ -112,7 +115,7 @@ if ($_GET["action"] == 'create')
 	  
 	  while ($i < $numdest)
 	    {
-	      $contact = $db->fetch_object( $i);
+	      $contact = $db->fetch_object();
 	      print '<option value="'.$contact->idp.'"';
 	      if ($contact->idp == $setcontact)
 		{
@@ -159,7 +162,7 @@ if ($_GET["action"] == 'create')
 	  
 	  while ($i < $numprojet)
 	    {
-	      $projet = $db->fetch_object($i);
+	      $projet = $db->fetch_object();
 	      print "<option value=\"$projet->rowid\">$projet->title</option>";
 	      $i++;
 	    }
@@ -169,7 +172,7 @@ if ($_GET["action"] == 'create')
     }
   else
     {
-      print $db->error()."$sql";
+      dolibarr_print_error($db);
     }
 
 
@@ -191,13 +194,13 @@ if ($_GET["action"] == 'create')
   $sql .= " ORDER BY ref DESC";
   if ( $db->query($sql) )
     {
-      $opt = "<option value=\"0\" SELECTED></option>";
+      $opt = "<option value=\"0\" selected></option>";
       if ($result)
 	{
 	  $num = $db->num_rows();	$i = 0;	
 	  while ($i < $num)
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 	      $opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
 	      $i++;
 	    }
@@ -211,7 +214,7 @@ if ($_GET["action"] == 'create')
   
   print_titre("Services/Produits");
     
-  print '<table class="border" cellspacing="0" cellpadding="3">';
+  print '<table class="border">';
   print '<tr><td>Produit</td><td>Quan.</td><td>Remise</td></tr>';
   for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
     {
diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php
index 6ad1fb9b114..789c40fcc6a 100644
--- a/htdocs/comm/bookmark.php
+++ b/htdocs/comm/bookmark.php
@@ -79,7 +79,7 @@ if ( $db->query($sql) )
     {
       $sortorder="DESC";
     }
-  print "<p><table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">";
+  print "<p><table class=\"noborder\" width=\"100%\">";
   print "<tr class=\"liste_titre\">";
   print "<td>&nbsp;</td>";
   print "<td align=\"center\"><a href=\"index.php?sortfield=idp&sortorder=$sortorder&begin=$begin\">Id</a></td>";
@@ -94,7 +94,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       
       $var=!$var;
       $bc1="bgcolor=\"#90c090\"";
@@ -107,24 +107,24 @@ if ( $db->query($sql) )
 	{
 	  $bc=$bc2;
 	}
-      print "<TR $bc>";
-      print "<TD>" . ($i + 1 + ($limit * $page)) . "</TD>";
-      print "<TD align=\"center\"><b>$obj->idp</b></TD>";
-      print "<TD><a href=\"index.php?socid=$obj->idp\">$obj->nom</A></TD>\n";
+      print "<tr $bc>";
+      print "<td>" . ($i + 1 + ($limit * $page)) . "</td>";
+      print "<td align=\"center\"><b>$obj->idp</b></td>";
+      print "<td><a href=\"index.php?socid=$obj->idp\">$obj->nom</A></td>\n";
       
-      print "<TD align=\"center\">$obj->stcomm</TD>\n";
-      print "<TD>$obj->author</TD>\n";
+      print "<td align=\"center\">$obj->stcomm</td>\n";
+      print "<td>$obj->author</TD>\n";
       print "<td>".strftime("%d %b %Y %H:%M", $obj->dateb) ."</td>";
-      print "<TD>[<a href=\"bookmark.php?action=delete&bid=$obj->bid\">Delete</A>]</TD>\n";
-      print "</TR>\n";
+      print "<td>[<a href=\"bookmark.php?action=delete&bid=$obj->bid\">Delete</A>]</TD>\n";
+      print "</tr>\n";
       $i++;
     }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error();
+  dolibarr_print_error()$db;
 }
 
 $db->close();
diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php
index f660885de82..0027a6311bf 100644
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -85,21 +85,12 @@ if ($sortfield == "")
 
 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit +1, $offset);
 
+
 $result = $db->query($sql);
 if ($result)
 {
   $num = $db->num_rows();
-  /*
-  if ($num == 1)
-    {
-      $obj = $db->fetch_object(0);
-      Header("Location: fiche.php?socid=$obj->idp");
-    }
-  else
-    {
-      llxHeader();
-    }
-  */
+
   llxHeader();
 
 
@@ -149,7 +140,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       
       $var=!$var;
 
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 7b7a37b7b6f..7c93656ef4b 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -23,6 +23,8 @@
  */
 require("./pre.inc.php");
 
+$langs->load("companies");
+
 $user->getrights('propale');
 $user->getrights('fichinter');
 $user->getrights('commande');
@@ -130,7 +132,7 @@ if ($result)
   
   print_barre_liste("Liste des contacts $label",$page, "contact.php", "&amp;type=$type",$sortfield,$sortorder,"",$num);
   
-  print "<DIV align=\"center\">";
+  print "<div align=\"center\">";
   
   print "| <A href=\"contact.php?type=$type&page=$pageprev&stcomm=$stcomm&sortfield=$sortfield&sortorder=$sortorder&aclasser=$aclasser&coord=$coord\">*</A>\n| ";
   for ($i = 65 ; $i < 91; $i++) {
@@ -159,45 +161,43 @@ if ($result)
   
   print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre"><td>';
-  print_liste_field_titre("Nom","contact.php","lower(p.name)", $begin,"&amp;type=$type");
+  print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&amp;type=$type");
   print "</td><td>";
-  print_liste_field_titre("Prénom","contact.php","lower(p.firstname)", $begin,"&amp;type=$type");
+  print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&amp;type=$type");
   print "</td><td>";
-  print_liste_field_titre("Société","contact.php","lower(s.nom)", $begin,"&amp;type=$type");
-  print "</td><TD>email</TD>";
-  print '<td>Téléphone</td>';
+  print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&amp;type=$type");
+  print '</td><td>'.$langs->trans("Lastname").'</td>';
+  print '<td>'.$langs->trans("Phone").'</td>';
   print "</tr>\n";
   $var=True;
   $i = 0;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
     
       $var=!$var;
 
-      print "<TR $bc[$var]>";
-      print '<TD><a href="'.DOL_URL_ROOT.'/comm/people.php?contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.img_file();
+      print "<tr $bc[$var]>";
+      print '<td><a href="'.DOL_URL_ROOT.'/comm/people.php?contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.img_file();
       print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/comm/people.php?contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->name.'</a></td>';
-      print "<TD>$obj->firstname</TD>";
+      print "<td>$obj->firstname</TD>";
       
-      print '<TD><a href="contact.php?type='.$type.'&socid='.$obj->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filter.png" border="0" alt="filtrer"></a>&nbsp;';
+      print '<td><a href="contact.php?type='.$type.'&socid='.$obj->idp.'"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/filter.png" border="0" alt="filtrer"></a>&nbsp;';
       print "<a href=\"".$urlfiche."?socid=$obj->idp\">$obj->nom</A></td>\n";
       
       print '<td><a href="action/fiche.php?action=create&actionid=4&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.$obj->email.'</a>&nbsp;</td>';
       
       print '<td><a href="action/fiche.php?action=create&actionid=1&contactid='.$obj->cidp.'&socid='.$obj->idp.'">'.dolibarr_print_phone($obj->phone).'</a>&nbsp;</td>';
       
-      print "</TR>\n";
+      print "</tr>\n";
       $i++;
     }
-  print "</TABLE></p>";
+  print "</table></p>";
   $db->free();
 }
 else
 {
-  print_barre_liste("Liste des contacts $label",$page, "contact.php");
-  
-  print $db->error();
+    dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index e7bd4fb7bda..57315874b66 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -98,7 +98,7 @@ if ($mode == 'search') {
       
   if ( $db->query($sql) ) {
     if ( $db->num_rows() == 1) {
-      $obj = $db->fetch_object(0);
+      $obj = $db->fetch_object();
       $socid = $obj->idp;
     }
     $db->free();
@@ -269,7 +269,7 @@ if ($_socid > 0)
 	$i = 0;	$now = time(); $lim = 3600 * 24 * 15 ;
 	while ($i < $num && $i < 2)
 	  {
-	    $objp = $db->fetch_object( $i);
+	    $objp = $db->fetch_object();
 	    print "<tr $bc[$var]>";
 	    print "<td><a href=\"propal.php?propalid=$objp->propalid\">$objp->ref</a>\n";
 	    if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 )
@@ -307,7 +307,7 @@ if ($_socid > 0)
 	$i = 0;	$now = time(); $lim = 3600 * 24 * 15 ;
 	while ($i < $num && $i < 2)
 	  {
-	    $objp = $db->fetch_object( $i);
+	    $objp = $db->fetch_object();
 	    $var=!$var;
 	    print "<tr $bc[$var]>";
 	    print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->propalid.'">'.$objp->ref."</a>\n";
@@ -339,7 +339,7 @@ if ($_socid > 0)
 	print "<td colspan=\"2\"><a href=\"../projet/index.php?socidp=$objsoc->id\">liste des projets ($num)</td></tr>";
       }
       while ($i < $num && $i < 5) {
-	$obj = $db->fetch_object( $i);
+	$obj = $db->fetch_object();
 	$tag = !$tag;
 	print "<tr $bc[$tag]>";
 	print '<td><a href="../projet/fiche.php?id='.$obj->rowid.'">'.$obj->title.'</a></td>';
@@ -426,7 +426,7 @@ if ($_socid > 0)
       $i = 0 ; $num = $db->num_rows(); $tag = True;
       while ($i < $num)
 	{
-	$obj = $db->fetch_object( $i);
+	$obj = $db->fetch_object();
 	$var = !$var;
 	print "<tr $bc[$var]>";
 
@@ -486,7 +486,7 @@ if ($_socid > 0)
 	while ($i < $num) {
 	  $var = !$var;
 
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]>";
 
 	  if ($oldyear == strftime("%Y",$obj->da) ) 
@@ -578,7 +578,7 @@ if ($_socid > 0)
 	    {
 	      $var = !$var;
 	      
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      print "<tr $bc[$var]>";
 	      
 	      if ($oldyear == strftime("%Y",$obj->da) )
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index b6db43f3bfa..e6ced2b262d 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -109,7 +109,7 @@ if ($conf->propal->enabled) {
 	      
 	      while ($i < $num)
 		{
-		  $obj = $db->fetch_object( $i);
+		  $obj = $db->fetch_object();
 		  $var=!$var;
 		  print "<tr $bc[$var]><td><a href=\"propal.php?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
 		  $i++;
@@ -144,7 +144,7 @@ if ($conf->commande->enabled)
           $var = False;
           while ($i < $num)
 	    {
-	      $obj = $db->fetch_object($i);
+	      $obj = $db->fetch_object();
 	      print "<tr $bc[$var]><td width=\"20%\"><a href=\"../commande/fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	      print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
 	      $i++;
@@ -184,7 +184,7 @@ if ( $db->query($sql) )
       
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var = !$var;
 	  print "<tr $bc[$var]>";
 	  print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
@@ -225,7 +225,7 @@ if ( $db->query($sql) )
 
   while ($i < $num ) 
 	{
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  
 	  print "<tr $bc[$var]>";
@@ -272,7 +272,7 @@ if ( $db->query($sql) )
       
       while ($i < $num ) 
 	{
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  
 	  print "<tr $bc[$var]>";
@@ -332,7 +332,7 @@ if ($conf->contrat->enabled)
 	  $var=false;
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      print "<tr $bc[$var]><td><a href=\"../contrat/fiche.php?id=".$obj->rowid."\">".img_file()."</a>&nbsp;";
 	      print "<a href=\"../contrat/fiche.php?id=".$obj->rowid."\">".$obj->ref."</a></td>";
 	      print "<td><a href=\"fiche.php?socid=$obj->idp\">$obj->nom</a></td>\n";      
@@ -375,7 +375,7 @@ if ($conf->propal->enabled) {
 	  $var=false;
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      print "<tr $bc[$var]><td width=\"15%\"><a href=\"propal.php?propalid=".$obj->propalid."\">".img_file()."</a>&nbsp;";
 	      print "<a href=\"propal.php?propalid=".$obj->propalid."\">".$obj->ref."</a></td>";
 	      print "<td width=\"30%\"><a href=\"fiche.php?socid=$obj->idp\">$obj->nom</a></td>\n";      
@@ -417,7 +417,7 @@ if ($conf->propal->enabled) {
 	    $var=False;	      
 	    while ($i < $num)
 	      {
-		$objp = $db->fetch_object( $i);		  
+		$objp = $db->fetch_object();		  
 		print "<tr $bc[$var]>";
 		print '<td width="15%">';
 		print '<a href="propal.php?propalid='.$objp->propalid.'">'.img_file().'</a>';
diff --git a/htdocs/comm/people.php b/htdocs/comm/people.php
index 91f67b89209..862332c27be 100644
--- a/htdocs/comm/people.php
+++ b/htdocs/comm/people.php
@@ -86,7 +86,7 @@ if ($_GET["socid"] > 0)
 
   if ($result) 
     {
-      $objsoc = $db->fetch_object( 0);
+      $objsoc = $db->fetch_object($result);
 
       /*
        *
@@ -130,7 +130,7 @@ if ($_GET["socid"] > 0)
 
   while ($i < $num) 
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       print "<tr>";
       print "<td>$obj->firstname $obj->name</td>";
       print "<td>$obj->poste&nbsp;</td>";
@@ -171,7 +171,7 @@ if ($_GET["socid"] > 0)
 
       if ( $num >0 ) 
 	{
-	  $obj = $db->fetch_object( 0);
+	  $obj = $db->fetch_object();
 	}
   
       print "<form method=\"post\" action=\"people.php?socid=$socid\">";
@@ -227,7 +227,7 @@ if ($_GET["socid"] > 0)
       $i = 0 ; $num = $db->num_rows(); $tag = True;
       while ($i < $num) 
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
 	  
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index f39861c22f2..52db2e88d9d 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -275,7 +275,7 @@ if ($_GET["propalid"])
 
   if ( $result )
     {
-      $obj = $db->fetch_object( 0 );
+      $obj = $db->fetch_object($result);
     
       if ($db->num_rows()) 
 	{
@@ -416,7 +416,7 @@ if ($_GET["propalid"])
 
 	      while ($i < $num) 
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object($result);
 		  $var=!$var;
 		  print "<TR $bc[$var]>";
 		  print "<td>[$objp->ref]</td>\n";
@@ -446,7 +446,7 @@ if ($_GET["propalid"])
 	      $i = 0;	     
 	      while ($i < $num) 
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  $var=!$var;
 		  print "<TR $bc[$var]><td>&nbsp;</td>\n";
 		  print '<td>'.$objp->description.'</td>';
@@ -473,15 +473,14 @@ if ($_GET["propalid"])
 	    {
 	      $sql = "SELECT p.rowid,p.label,p.ref,p.price FROM ".MAIN_DB_PREFIX."product as p WHERE p.envente=1 ORDER BY p.nbvente DESC LIMIT 20";
 	      // RyXéo on a ORDER BY p.ref et pas de limit
-	      if ( $db->query($sql) )
-		{
-		  $opt = "<option value=\"0\" SELECTED></option>";
+	      $result = $db->query($sql);
 		  if ($result)
 		    {
+    		  $opt = "<option value=\"0\" selected></option>";
 		      $num = $db->num_rows();	$i = 0;	
 		      while ($i < $num)
 			{
-			  $objp = $db->fetch_object( $i);
+			  $objp = $db->fetch_object($result);
 			  $opt .= "<option value=\"$objp->rowid\">[$objp->ref] ".substr($objp->label,0,40)."</option>\n";
 			  $i++;
 			}
@@ -743,12 +742,12 @@ if ($_GET["propalid"])
 
 		  while ($i < $num)
 		    {
-		      $objp = $db->fetch_object( $i);
-		      print "<TR><TD>".strftime("%d %B %Y %H:%M:%S",$objp->da)."</TD>\n";
+		      $objp = $db->fetch_object();
+		      print "<tr><td>".strftime("%d %B %Y %H:%M:%S",$objp->da)."</td>\n";
 		      $authoract = new User($db);
 		      $authoract->id = $objp->fk_user_author;
 		      $authoract->fetch('');
-		      print "<TD>$authoract->code</TD></tr>\n";
+		      print "<td>$authoract->code</td></tr>\n";
 		      print "<tr><td colspan=\"2\">$objp->note</td></tr>";
 		      $i++;
 		    }
@@ -899,11 +898,11 @@ if ($_GET["propalid"])
 
       print_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="10%" align="center"',$sortfield);
       print "</tr>\n";
-      $var=True;
+      $var=true;
       
       while ($i < min($num,$limit))
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object();
 	  $now = time();
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
@@ -930,7 +929,7 @@ if ($_GET["propalid"])
 	      print "<td>&nbsp;</td>";
 	    }
 	  
-	  print "<TD align=\"right\">";
+	  print "<td align=\"right\">";
 	  $y = strftime("%Y",$objp->dp);
 	  $m = strftime("%m",$objp->dp);
 	  
@@ -940,9 +939,9 @@ if ($_GET["propalid"])
 	  print " <a href=\"propal.php?year=$y\">";
 	  print strftime("%Y",$objp->dp)."</a></TD>\n";      
 	  
-	  print "<TD align=\"right\">".price($objp->price)."</TD>\n";
-	  print "<TD align=\"center\">$objp->statut</TD>\n";
-	  print "</TR>\n";
+	  print "<td align=\"right\">".price($objp->price)."</td>\n";
+	  print "<td align=\"center\">$objp->statut</td>\n";
+	  print "</tr>\n";
 	  
 	  $total = $total + $objp->price;
 	  $subtotal = $subtotal + $objp->price;
diff --git a/htdocs/comm/propal_model_pdf.class.php b/htdocs/comm/propal_model_pdf.class.php
index aca69c70815..cb057bf064b 100644
--- a/htdocs/comm/propal_model_pdf.class.php
+++ b/htdocs/comm/propal_model_pdf.class.php
@@ -49,7 +49,7 @@ class Propal_Model_Pdf {
 	      $i = 0;
 	      while ($i < $nump)
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object();
 	      
 		  $projets[$obj->nom] = $obj->nom;
 		  $i++;
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index b04ed7725e6..e6364ccacf6 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -183,7 +183,7 @@ if ($socid > 0)
 	$i = 0;	$now = time(); $lim = 3600 * 24 * 15 ;
 	while ($i < $num && $i < 2)
 	  {
-	    $objp = $db->fetch_object( $i);
+	    $objp = $db->fetch_object();
 	    print "<tr $bc[$var]>";
 	    print "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
 	    print img_file();
@@ -245,7 +245,7 @@ if ($socid > 0)
     $i = 0 ; $num = $db->num_rows(); $tag = True;
     while ($i < $num)
       {
-	$obj = $db->fetch_object( $i);
+	$obj = $db->fetch_object($result);
 	$var = !$var;
 	print "<tr $bc[$var]>";
 	
@@ -306,7 +306,7 @@ if ($socid > 0)
 	while ($i < $num) {
 	  $var = !$var;
 
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 		
 	  print "<tr $bc[$var]>";
 
@@ -398,12 +398,12 @@ if ($socid > 0)
 	  if ($num)
 	    {
 
-	      print '<table width="100%" cellspacing="0" border="0" cellpadding="2">';
+	      print '<table width="100%" class="noborder">';
 	      print '<tr class="liste_titre"><td><a href="action/index.php?socid='.$socid.'">Actions effectuées</a></td></tr>';
 	      print '<tr>';
 	      print '<td valign="top">';
 	      	      
-	      print '<table width="100%" cellspacing="0" border="0" cellpadding="1">';
+	      print '<table width="100%" border="0">';
 	      
 	      $oldyear='';
 	      $oldmonth='';
@@ -411,7 +411,7 @@ if ($socid > 0)
 		{
 		  $var = !$var;
 		  
-		  $obj = $db->fetch_object( $i);
+		  $obj = $db->fetch_object();
 		  print "<tr $bc[$var]>";
 		  
 		  if ($oldyear == strftime("%Y",$obj->da) )
@@ -430,12 +430,12 @@ if ($socid > 0)
 		    }
 		  else
 		    {
-		      print "<TD align=\"center\">" .strftime("%b",$obj->da)."</TD>\n"; 
+		      print "<td align=\"center\">" .strftime("%b",$obj->da)."</TD>\n"; 
 		      $oldmonth = strftime("%Y%b",$obj->da);
 		    }
 		  
-		  print "<TD>" .strftime("%d",$obj->da)."</TD>\n"; 
-		  print "<TD>" .strftime("%H:%M",$obj->da)."</TD>\n";
+		  print "<td>" .strftime("%d",$obj->da)."</td>\n"; 
+		  print "<td>" .strftime("%H:%M",$obj->da)."</td>\n";
 		  
 		  print '<td width="10%">&nbsp;</td>';
 		  
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index fff0a9dc1b4..8012d2eee2e 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -84,7 +84,7 @@ if ( $db->query($sql) )
       print '<td colspan="2">Prospects par statut</td></tr>';
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  print "<tr $bc[$var]><td><a href=\"prospects.php?page=0&amp;stcomm=".$obj->id."\">".$obj->libelle."</a></td><td>".$obj->cc."</td></tr>";
 	  $i++;
@@ -113,7 +113,7 @@ if ($conf->propal->enabled)
 	  
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      $var=!$var;
 	      print "<tr $bc[$var]><td><a href=\"propal.php?propalid=".$obj->rowid."\">".$obj->ref."</a></td></tr>";
 	      $i++;
@@ -147,7 +147,7 @@ if ( $db->query($sql) )
       $i = 0;
       while ($i < $num ) 
 	{
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  
 	  print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td>";
@@ -185,7 +185,7 @@ if ( $db->query($sql) )
       
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  print "<tr $bc[$var]><td width=\"20%\"><a href=\"../propal.php?propalid=".$obj->rowid."\">";
 	  print img_file();
@@ -221,7 +221,7 @@ if ( $db->query($sql) )
       
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var=!$var;
 	  print "<tr $bc[$var]><td width=\"12%\"><a href=\"../propal.php?propalid=".$obj->rowid."\">";
 	  print img_file();
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index 29d9c796c38..da08e00a54b 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -112,7 +112,7 @@ if ($result)
 
   if ($num == 1 && $socname)
     {
-      $obj = $db->fetch_object(0);
+      $obj = $db->fetch_object($result);
       Header("Location: fiche.php?socid=$obj->idp");
     }
   else
@@ -144,9 +144,9 @@ if ($result)
 
   $i = 0;
   
-  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
-  print '<TR class="liste_titre">';
-  print "<TD valign=\"center\">";
+  print '<table class="noborder" width="100%">';
+  print '<tr class="liste_titre">';
+  print "<td valign=\"center\">";
   print_liste_field_titre("Société","prospects.php","s.nom");
   print "</td><td>";
   print_liste_field_titre("Ville","prospects.php","s.ville");
@@ -158,12 +158,12 @@ if ($result)
   print "</td><td>";
   print_liste_field_titre("Insertion","prospects.php","s.datec");
   print '</td><td colspan="4">&nbsp;</td>';
-  print "</TR>\n";
-  $var=True;
+  print "</tr>\n";
+  $var=true;
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       
       $var=!$var;
 
@@ -171,13 +171,13 @@ if ($result)
       print '<td width="35%"><a href="fiche.php?id='.$obj->idp.'">';
       print img_file();
       print "</a>&nbsp;<a href=\"fiche.php?id=$obj->idp\">$obj->nom</A></td>\n";
-      print "<TD>".$obj->ville."&nbsp;</TD>\n";
-      print "<TD align=\"center\">$obj->departement</TD>\n";
+      print "<td>".$obj->ville."&nbsp;</td>\n";
+      print "<td align=\"center\">$obj->departement</td>\n";
       print "<td>".$obj->stcomm."</td>\n";
 
       if ($user->societe_id == 0)
 	{
-	  print "<TD align=\"center\"><a href=\"addpropal.php?socidp=$obj->idp&action=create\">".strftime("%d/%b/%y",$obj->datec)."</A></td>\n";
+	  print "<td align=\"center\"><a href=\"addpropal.php?socidp=$obj->idp&action=create\">".strftime("%d/%b/%y",$obj->datec)."</A></td>\n";
 
 	}
       else
@@ -200,15 +200,15 @@ if ($result)
 	    }
 	}
 
-      print "</TR>\n";
+      print "</tr>\n";
       $i++;
     }
-  print "</TABLE>";
+  print "</table>";
   $db->free();
 }
 else
 {
-  print $db->error() . ' ' . $sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 46c48879128..4882e0c92ca 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -449,7 +449,7 @@ class Commande
 	    {
 	      if ($this->db->num_rows())
 		{
-		  $obj = $this->db->fetch_object(0);
+		  $obj = $this->db->fetch_object();
 		  $this->propale_id = $obj->fk_propale;
 		}
 
@@ -495,7 +495,7 @@ class Commande
 	  {
 	    $ligne = new CommandeLigne();
 
-	    $objp = $this->db->fetch_object( $i);
+	    $objp = $this->db->fetch_object($result);
 
 	    $ligne->id = $objp->rowid;
 
@@ -649,7 +649,7 @@ class Commande
 	  
 	  while ($i < $num)
 	    {
-	      $obj = $this->db->fetch_object($i);
+	      $obj = $this->db->fetch_object();
 	      $products[$i][0] = $obj->price;
 	      $products[$i][1] = $obj->qty;
 	      $products[$i][2] = $obj->tva_tx;
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index ef030d85ee4..84d68d480b9 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -225,7 +225,7 @@ if ($_GET["action"] == 'create')
       $num = $db->num_rows();
       if ($num)
 	{
-	  $obj = $db->fetch_object(0);
+	  $obj = $db->fetch_object();
 
 	  $soc = new Societe($db);
 	  $soc->fetch($obj->idp);
@@ -291,13 +291,13 @@ if ($_GET["action"] == 'create')
 	      $sql .= " ORDER BY p.nbvente DESC LIMIT 20";
 	      if ( $db->query($sql) )
 		{
-		  $opt = "<option value=\"0\" SELECTED></option>";
+		  $opt = "<option value=\"0\" selected></option>";
 		  if ($result)
 		    {
 		      $num = $db->num_rows();	$i = 0;	
 		      while ($i < $num)
 			{
-			  $objp = $db->fetch_object( $i);
+			  $objp = $db->fetch_object();
 			  $opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->price</option>\n";
 			  $i++;
 			}
@@ -351,7 +351,7 @@ if ($_GET["action"] == 'create')
 		  $var=True;	
 		  while ($i < $num) 
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
 		      print '<td>'.$objp->product.'</td>';
@@ -370,7 +370,7 @@ if ($_GET["action"] == 'create')
 		  $i = 0;	
 		  while ($i < $num) 
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]><td>&nbsp;</td>\n";
 		      print '<td>'.$objp->product.'</td>';
@@ -558,7 +558,7 @@ else
 	      $var=True;
 	      while ($i < $num)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  print "<TR $bc[$var]>";
 		  if ($objp->fk_product > 0)
 		    {
@@ -636,7 +636,7 @@ else
 		      $num = $db->num_rows();	$i = 0;	
 		      while ($i < $num)
 			{
-			  $objp = $db->fetch_object( $i);
+			  $objp = $db->fetch_object();
 			  $opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->price</option>\n";
 			  $i++;
 			}
@@ -744,7 +744,7 @@ else
 		$var=True;
 		while ($i < $num)
 		  {
-		    $objp = $db->fetch_object( $i);
+		    $objp = $db->fetch_object();
 		    $var=!$var;
 		    print "<tr $bc[$var]>";
 		    print '<td><a href="../expedition/fiche.php?id='.$objp->rowid.'">'.stripslashes($objp->ref).'</a></td>';
@@ -774,13 +774,13 @@ else
 	      {
 		print_titre("Factures");
 		$i = 0; $total = 0;
-		print '<table border="1" cellspacing="0" cellpadding="4" width="100%">';
+		print '<table class="border" width="100%">';
 		print "<tr $bc[$var]><td>Facture</td><td>Date</td></tr>\n";
 		
 		$var=True;
 		while ($i < $num)
 		  {
-		    $objp = $db->fetch_object( $i);
+		    $objp = $db->fetch_object();
 		    $var=!$var;
 		    print "<tr $bc[$var]>";
 		    print '<td><a href="../compta/facture.php?facid='.$objp->rowid.'">'.stripslashes($objp->facnumber).'</a></td>';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index a877efb036f..f12a1b04a4d 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -67,7 +67,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"30%\"><a href=\"fiche.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -101,7 +101,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"30%\"><a href=\"fiche.php?id=$obj->rowid\">".img_file()."</a>";
 	  print "&nbsp;<a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -139,7 +139,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"30%\"><a href=\"fiche.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -172,7 +172,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"30%\"><a href=\"fiche.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index 9e6809c90a6..b1281df8c9a 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -108,7 +108,7 @@ if ( $db->query($sql) )
 
   while ($i < min($num,$limit))
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
diff --git a/htdocs/commande/osccommande.class.php b/htdocs/commande/osccommande.class.php
index fe56c226dfc..574003115ff 100644
--- a/htdocs/commande/osccommande.class.php
+++ b/htdocs/commande/osccommande.class.php
@@ -78,7 +78,7 @@ class OscCommande {
 	    $i = 0;
 	    while ($i < $nump)
 	      {
-		$obj = $this->db->fetch_object($i);
+		$obj = $this->db->fetch_object();
 		
 		$ga[$obj->rowid] = $obj->title;
 		$i++;
diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index 4ac08c9fc58..9887801adf0 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -116,7 +116,7 @@ class Account
 	$num = $this->db->num_rows();
 	while ($i < $num)
 	  {
-	    $obj = $this->db->fetch_object($result, $i);
+	    $obj = $this->db->fetch_object($result);
 	    $lines[$i][0] = $obj->url;
 	    $lines[$i][1] = $obj->url_id;
 	    $lines[$i][2] = $obj->label;
@@ -297,7 +297,7 @@ class Account
       {
 	if ($this->db->num_rows())
 	  {
-	    $obj = $this->db->fetch_object($result , 0);
+	    $obj = $this->db->fetch_object($result);
 	    
 	    $this->bank          = $obj->bank;
 	    $this->label         = $obj->label;
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 1708fadad47..e8062c24bf0 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -111,7 +111,7 @@ if ($account > 0)
       $options = "<option value=\"0\" SELECTED></option>";
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object($result);
 	  $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
 	}
       $db->free();
@@ -329,7 +329,7 @@ function _print_lines($db,$sql,$acct)
       
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object();
 	  $total = $total + $objp->amount;
 	  $time = time();
 	  if ($i >= ($nbline - $viewline))
diff --git a/htdocs/compta/bank/bplc.php b/htdocs/compta/bank/bplc.php
index 0b5e6da76bc..b7e62208a87 100644
--- a/htdocs/compta/bank/bplc.php
+++ b/htdocs/compta/bank/bplc.php
@@ -68,7 +68,7 @@ if ($result) {
   $sep = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
 
     print "<tr $bc[1]>";
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index e1a2b8e3aba..377b1b72751 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -58,7 +58,7 @@ if ($_GET["bid"] == 0)
       $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=\"budget.php?bid=$objp->rowid\">$objp->label</a></td>";
@@ -116,10 +116,10 @@ else
       $var=True;
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
-	  print "<td align=\"right\">".strftime("%d %B %Y",$objp->do)."</TD>\n";
+	  print "<td align=\"right\">".strftime("%d %B %Y",$objp->do)."</td>\n";
 	  
 	  print "<td><a href=\"ligne.php?rowid=$objp->rowid\">$objp->label</a></td>";
 	  print "<td align=\"right\">".price(0 - $objp->amount)."</td><td>&nbsp;</td>";
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index ff6b6fc39f0..0ce0c8b7168 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -69,7 +69,7 @@ if ($result)
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td>$objp->rowid</td>";
diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php
index 0fb900bb23a..0ec5301b6fe 100644
--- a/htdocs/compta/bank/config.php
+++ b/htdocs/compta/bank/config.php
@@ -60,7 +60,7 @@ if ($result)
   $sep = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
 
     $var=!$var;
     print "<tr $bc[$var]><td>$objp->rowid</td><td><a href=\"fiche.php?id=$objp->rowid\">$objp->label</a></td>";
diff --git a/htdocs/compta/bank/functions.lib.php b/htdocs/compta/bank/functions.lib.php
index cfd6d95666d..c49b8db3bc4 100644
--- a/htdocs/compta/bank/functions.lib.php
+++ b/htdocs/compta/bank/functions.lib.php
@@ -32,7 +32,7 @@ function gljPrintSelect($db, $refid) {
   $num = $db->num_rows();
   $i = 0;
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
     print "<OPTION VALUE=$obj->id";
     if ($refid==$obj->id) { 
       print " SELECTED"; 
@@ -63,7 +63,7 @@ function gljCopy_Soc($idsoc, $dbfrom, $dbto) {
 	$result = pg_Exec($connfrom, $sql);
 	if ( $result ) {
 	  if (pg_NumRows($result) ) {
-	    $obj = pg_Fetch_Object($result, 0);
+	    $obj = pg_Fetch_Object($result);
 	    
 	    $sql = "INSERT INTO societe (id, nom, datec, fk_effectif) ";
 	    $sql .= "VALUES ('$idsoc', '$obj->nom', $madate, $obj->fk_effectif)";
@@ -98,7 +98,7 @@ function gljMailLogin ($db, $address, $id, $dbname) {
   
   if ($db->query($sql)) {
     if ($db->num_rows() > 0) {
-      $obj = $db->fetch_object(0);
+      $obj = $db->fetch_object();
       $db->free();
 
       $subject = "Confirmation";
@@ -242,7 +242,7 @@ function gljCreateCompany($db, $company_name, $address, $cp, $ville, $fkpays, $p
       $sql = "SELECT idp FROM societe WHERE id= '$token';";
       if ( $db->query($sql) ) {
 	if ( $db->num_rows() ) {
-	  $obj = $db->fetch_object(0);
+	  $obj = $db->fetch_object();
 	  return $obj->idp;
 	  $db->free();
 	  
@@ -407,7 +407,7 @@ function get_ofid_by_idp ($db, $ofidp) {
   } else {
     if ($db->num_rows() > 0) {
       $row = 0;
-      while($data = $db->fetch_object( $row)) {
+      while($data = $db->fetch_object($result)) {
 	$id = $data->id ;
       }
       return $id;
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 19787fe0dbb..c5b52e3700c 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -46,7 +46,7 @@ if ($result)
   $num = $db->num_rows();
   $i = 0; 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
     $accounts[$i] = $objp->rowid;
     
     $i++;
@@ -57,7 +57,7 @@ if ($result)
 /*
  * Comptes
  */
-print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>Comptes courants</td><td>Banque</td>';
 print '<td align="left">Numéro</td><td align="right">Solde</td><td align="center">Clos</td>';
 print "</tr>\n";
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 86e3b6e79c0..8502801d295 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -81,7 +81,7 @@ if ($_POST["action"] == 'UPDATE')
       $var=True;  
       $amount = str_replace(' ','',$_POST['amount']);
       $num = $db->num_rows();
-      $objp = $db->fetch_object( 0);
+      $objp = $db->fetch_object($result);
       if ($objp->rappro)
         die ("Vous ne pouvez pas modifier une écriture déjà rapprochée");
       $sql = "UPDATE ".MAIN_DB_PREFIX."bank set label='".$_POST["label"]."' , dateo = '".$_POST["date"]."', amount='$amount' WHERE rowid = $rowid;";
@@ -115,7 +115,7 @@ if ($result)
   $options = "<option value=\"0\" SELECTED></option>";
   while ($i < $num)
     {
-      $obj = $db->fetch_object($i);
+      $obj = $db->fetch_object($result);
       $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n";
       $i++;
     }
@@ -150,7 +150,7 @@ if ($result)
   $i = 0; $total = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object($i);
+      $objp = $db->fetch_object($result);
       $total = $total + $objp->amount;
       
       $acct=new Account($db,$objp->fk_account);
@@ -269,7 +269,7 @@ if ($result)
   $i = 0; $total = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
 
       $var=!$var;
       print "<tr $bc[$var]>";
diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php
index 5b6497e913b..12d2fe5b049 100644
--- a/htdocs/compta/bank/pre.inc.php
+++ b/htdocs/compta/bank/pre.inc.php
@@ -49,7 +49,7 @@ function llxHeader($head = "")
 
       while ($i < $numr) 
 	{
-	  $objp = $db->fetch_object($i);
+	  $objp = $db->fetch_object($result);
 	  $menu->add(DOL_URL_ROOT."/compta/bank/account.php?account=" . $objp->rowid,  $objp->label);
 	  $menu->add_submenu(DOL_URL_ROOT."/compta/bank/releve.php?account=" . $objp->rowid ,"Relevés");
       $menu->add_submenu(DOL_URL_ROOT."/compta/bank/annuel.php?account=" . $objp->rowid ,"Rapport mensuel E/S");
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index b10876a5eb6..fab6fc4f307 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -88,7 +88,7 @@ if ($result) {
   $i = 0;
   while ($i < $num) {
     if ($options == "") { $options = "<option value=\"0\" selected>&nbsp;</option>"; }
-    $obj = $db->fetch_object($i);
+    $obj = $db->fetch_object($result);
     $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
   }
   $db->free();
@@ -157,7 +157,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
 
       $var=!$var;
       print "<tr $bc[$var]>";
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 1411a74874c..b193fb02a9f 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -90,7 +90,7 @@ if (! isset($_GET["num"]))
 
       while ($i < min($numrows,$limit))
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	  if (! $objp->numr)
 	    { 
@@ -200,7 +200,7 @@ else
 
       while ($i < $numrows)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $total = $total + $objp->amount;
 	  
 	  $var=!$var;
@@ -222,23 +222,22 @@ else
 	  
 	  if ($ve)
 	    {
-	      $dc = $db->clone();
 	      $sql = "SELECT label FROM ".MAIN_DB_PREFIX."bank_categ as ct, ".MAIN_DB_PREFIX."bank_class as cl WHERE ct.rowid=cl.fk_categ AND cl.lineid=$objp->rowid";
-	      $resc = $dc->query($sql);
+	      $resc = $db->query($sql);
 	      if ($resc)
 		{
-		  $numc = $dc->num_rows();
+		  $numc = $db->num_rows();
 		  $ii = 0; 
 		  while ($ii < $numc)
 		    {
-		      $objc = $dc->fetch_object($ii);
+		      $objc = $db->fetch_object($resc);
 		      print "<br>-&nbsp;<i>$objc->label</i>";
 		      $ii++;
 		    }
 		}
 	      else
 		{
-		  print $dc->error();
+		  dolibarr_print_error($db);
 		}
 	    }
 	  
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index a53e1020002..85cafff553e 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -94,9 +94,9 @@ if ($result) {
   $var=True;  
   $num = $db->num_rows();
   $i = 0;
-    $options = "<option value=\"0\" SELECTED></option>";
+    $options = "<option value=\"0\" selected></option>";
     while ($i < $num) {
-      $obj = $db->fetch_object($i);
+      $obj = $db->fetch_object($result);
       $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
     }
     $db->free();
@@ -140,7 +140,7 @@ if ($result)
   $i = 0;   
   
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
 
     $var=!$var;
 
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 86a6e96acae..84e353f24fc 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -110,7 +110,7 @@ if ($result)
     
     while ($i < $num)
       {
-	$objp = $db->fetch_object($i);
+	$objp = $db->fetch_object($result);
 	print "<option value=\"$objp->rowid\">$objp->label</option>";
 	$i++;
       }
@@ -128,7 +128,7 @@ if ($result)
     
     while ($i < $num)
       {
-	$objp = $db->fetch_object($i);
+	$objp = $db->fetch_object($result);
 	print "<option value=\"$objp->rowid\">$objp->label</option>";
 	$i++;
       }
diff --git a/htdocs/compta/charges.php b/htdocs/compta/charges.php
index 7abf7065631..0f58fa53787 100644
--- a/htdocs/compta/charges.php
+++ b/htdocs/compta/charges.php
@@ -82,7 +82,7 @@ if ( $db->query($sql) ) {
   $i = 0;
 
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
     $var = !$var;
     print "<tr $bc[$var]>";
     print '<td>'.$obj->nom.'</td><td>'.price($obj->total).'</td>';
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index f90e3c9dd88..9b17ed97150 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -66,7 +66,7 @@ if ( $db->query($sql) )
   $i = 0;
 
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
     $var = !$var;
     print "<tr $bc[$var]>";
     print '<td><a href="../sociales/index.php?filtre=s.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>';
@@ -95,7 +95,7 @@ if ( $db->query($sql) ) {
   $i = 0;
 
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
     $var = !$var;
     print "<tr $bc[$var]>";
     print '<td>Factures founisseurs</td>';
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 9d45abcc47b..02d0bd3db1d 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -144,7 +144,7 @@ if ($mode == 'search') {
       
   if ( $db->query($sql) ) {
     if ( $db->num_rows() == 1) {
-      $obj = $db->fetch_object(0);
+      $obj = $db->fetch_object();
       $socid = $obj->idp;
     }
     $db->free();
@@ -224,7 +224,7 @@ if ($result)
 
   while ($i < min($num,$conf->liste_limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       
       $var=!$var;
 
diff --git a/htdocs/compta/commande.php b/htdocs/compta/commande.php
index 3322cc4caa3..bc5978ea984 100644
--- a/htdocs/compta/commande.php
+++ b/htdocs/compta/commande.php
@@ -168,7 +168,7 @@ if ($_GET["id"] > 0)
 	  $var=True;
 	  while ($i < $num)
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 	      print "<tr $bc[$var]>";
 	      if ($objp->fk_product > 0)
 		{
@@ -263,7 +263,7 @@ if ($_GET["id"] > 0)
 	      $var=True;
 	      while ($i < $num_fac_asso)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  $var=!$var;
 		  print "<TR bgcolor=\"#e0e0e0\">";
 		  print "<TD><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>";
diff --git a/htdocs/compta/config.php b/htdocs/compta/config.php
index 332aab6e6d1..986baf93da1 100644
--- a/htdocs/compta/config.php
+++ b/htdocs/compta/config.php
@@ -66,7 +66,7 @@ if ($action == 'create') {
       if ($num > 0) {
 	$var=True;
 	while ($i < $num) {
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object();
 	  $var=!$var;
 	
 	  print "<tr $bc[$var]>";
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 9825d1ef851..12e7d1c9440 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -76,7 +76,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print '<td><a href="fiche.php?id='.$objp->rowid.'">'.dolibarr_print_date($objp->dd).'</a></td>';
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 02d1283212e..134ce525316 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -187,7 +187,7 @@ if ($_GET["action"] == 'create') {
       $i = 0; 
       while ($i < $num) 
 	{
-	  $objopt = $db->fetch_object( $i);
+	  $objopt = $db->fetch_object();
 	  print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
 	  $i++;
 	}    
@@ -260,7 +260,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
       $i = 0; 
       while ($i < $num) 
 	{
-	  $objopt = $db->fetch_object( $i);
+	  $objopt = $db->fetch_object();
 	  print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
 	  $i++;
 	}    
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index b8209a6ee1c..fe2c9e6081d 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -42,7 +42,7 @@ if ($result)
   $i = 0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
 
       $somme[$objp->fk_statut] = $objp->somme;
       $i++;
diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php
index 35b4760130b..87dabfc69ef 100644
--- a/htdocs/compta/dons/liste.php
+++ b/htdocs/compta/dons/liste.php
@@ -91,12 +91,12 @@ if ($result)
   $var=True;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
-      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->prenom)."</a></TD>\n";
-      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->nom)."</a></TD>\n";
-      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->societe)."</a></TD>\n";
+      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->prenom)."</a></td>\n";
+      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->nom)."</a></td>\n";
+      print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".stripslashes($objp->societe)."</a></td>\n";
       print "<td><a href=\"fiche.php?rowid=$objp->rowid\">".strftime("%d %B %Y",$objp->datedon)."</a></td>\n";
       print "<td>$objp->projet</td>\n";
       print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php
index 326e8d18fe0..6dec0181cf5 100644
--- a/htdocs/compta/dons/stats.php
+++ b/htdocs/compta/dons/stats.php
@@ -48,7 +48,7 @@ if ($result)
   $total=0;
   while ($i < $num)
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $total += $objp->amount;
       $i++;
     }
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 98853d2d96e..b66ec820814 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -69,6 +69,7 @@ if ($_POST["action"] == 'classin')
   $facture->fetch($_POST["facid"]);
   $facture->classin($_POST["projetid"]);
 }
+
 /*
  *
  */	
@@ -333,11 +334,11 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
 	    $sendto = $_POST["sendto"];
 	    $sendtoid = 0;
 	  }
-	  elseif ($_POST["destinataire"]) {
+	  elseif ($_POST["receiver"]) {
 	    // Le destinataire a été fourni via la liste déroulante
 	    $soc = new Societe($db, $fac->socidp);
-	    $sendto = $soc->contact_get_email($_POST["destinataire"]);
-	    $sendtoid = $_POST["destinataire"];
+	    $sendto = $soc->contact_get_email($_POST["receiver"]);
+	    $sendtoid = $_POST["receiver"];
 	  }
 	  
 	  if (strlen($sendto))
@@ -446,7 +447,7 @@ if ($_GET["action"] == 'create')
       $num = $db->num_rows();
       if ($num)
 	{
-	  $obj = $db->fetch_object(0);
+	  $obj = $db->fetch_object();
 
 	  $soc = new Societe($db);
 	  $soc->fetch($obj->idp);
@@ -483,7 +484,7 @@ if ($_GET["action"] == 'create')
 	      $i = 0;
 	      while ($i < $num)
 		{
-		  $objp = $db->fetch_object($i);
+		  $objp = $db->fetch_object();
 		  $conds[$objp->rowid]=$objp->libelle;
 		  $i++;
 		}
@@ -544,7 +545,7 @@ if ($_GET["action"] == 'create')
 		      $num = $db->num_rows();	$i = 0;	
 		      while ($i < $num)
 			{
-			  $objp = $db->fetch_object( $i);
+			  $objp = $db->fetch_object();
 			  $opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->price</option>\n";
 			  $i++;
 			}
@@ -601,7 +602,7 @@ if ($_GET["action"] == 'create')
 		      print '<option value="0" selected></option>';
 		      while ($i < $num)
 			{
-			  $objp = $db->fetch_object( $i);
+			  $objp = $db->fetch_object();
 			  print "<option value=\"$objp->rowid\">$objp->titre : $objp->amount</option>\n";
 			  $i++;
 			}
@@ -643,7 +644,7 @@ if ($_GET["action"] == 'create')
 		  $var=True;	
 		  while ($i < $num) 
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
 		      print '<td>'.$objp->product.'</td>';
@@ -662,7 +663,7 @@ if ($_GET["action"] == 'create')
 		  $i = 0;	
 		  while ($i < $num) 
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]><td>&nbsp;</td>\n";
 		      print '<td>'.$objp->product.'</td>';
@@ -705,7 +706,7 @@ if ($_GET["action"] == 'create')
 		  $var=True;	
 		  while ($i < $num) 
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
 		      print '<td>'.$objp->product.'</td>';
@@ -853,7 +854,7 @@ else
 	      $var=True;
 	      while ($i < $num)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  $var=!$var;
 		  print "<tr $bc[$var]><td>";
 		  print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>';
@@ -947,7 +948,7 @@ else
 	      $var=True;
 	      while ($i < $num_lignes)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  $var=!$var;
 		  print "<tr $bc[$var]>";
 		  if ($objp->fk_product > 0)
@@ -1229,7 +1230,7 @@ else
 		  $var=True;
 		  while ($i < $num)
 		    {
-		      $objp = $db->fetch_object( $i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]>";
 		      print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$objp->id.'">'.$objp->id.'</a></td>';
@@ -1276,12 +1277,18 @@ else
 	   */
 	  if ($_GET["action"] == 'presend')
 	    {
+	      print_titre("Envoyer la facture par mail");
+
+	      $langs->load("other");
+	      
 	      $replytoname = $user->fullname;
 	      $from_name = $replytoname;
 
 	      $replytomail = $user->email;
 	      $from_mail = $replytomail;
 	    
+	      $form = new Form($db);	    
+
 	      print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">\n";
 	      print '<input type="hidden" name="facid" value="'.$fac->id.'">';
 	      print '<input type="hidden" name="action" value="send">';
@@ -1289,34 +1296,42 @@ else
 	      print '<input type="hidden" name="replytomail" value="'.$replytomail.'">';
 	      print '<br>';
 	    
-	      print_titre("Envoyer la facture par mail");
-	      print "<table cellspacing=\"0\" class=\"border\" cellpadding=\"3\" width=\"100%\">";
-	      print "<tr><td>Expéditeur</td><td>$from_name</td><td>$from_mail &nbsp;</td></tr>";
-	      print "<tr><td>Répondre à</td><td>$replytoname</td><td>$replytomail &nbsp;</td></tr>";
-	      print '<tr><td>Destinataire</td><td colspan=\"2\">';
-	    
-	      $form = new Form($db);	    
-	      $form->select_array("destinataire",$soc->contact_email_array());
-	      print " ou <input size=\"30\" name=\"sendto\" value=\"$fac->email\"></td></tr>";
+	      // From
+	      print "<table class=\"border\" width=\"100%\">";
+	      print "<tr><td width=\"180\">".$langs->trans("MailFrom")."</td><td>$from_name".($from_mail?" &lt;$from_mail&gt;":"")."</td></tr>";
+	      print "<tr><td>".$langs->trans("MailReply")."</td><td>$replytoname".($replytomail?" &lt;$replytomail&gt;":"");
+	      print "</td></tr>";
+          print "</table>";
+          
+	      // To
+	      print "<table class=\"border\" width=\"100%\">";
+	      print '<tr><td width=\"180\">'.$langs->trans("MailTo").'</td><td>';
+	      $form->select_array("receiver",$soc->contact_email_array());
+	      print " ".$langs->trans("or")." <input size=\"30\" name=\"sendto\" value=\"$fac->email\"></td></tr>";
 
-	      print '<tr><td>Message</td><td colspan=\"2\">';
-	      print "<textarea rows=\"5\" cols=\"60\" name=\"message\">";
-	      print "Veuillez trouver ci-joint la facture $fac->ref\n\nCordialement\n\n";
-	      print "</textarea></td></tr>";
-
-	      print "</table><br>\n";
+	      // Topic + Message
+	      $defaultmessage="Veuillez trouver ci-joint la facture $fac->ref\n\nCordialement\n\n";
+	      $form->mail_topicmessagefile(0,1,0,$defaultmessage);
 	    
-	      print "<center><input class=\"flat\" type=\"submit\" value=\"".$langs->trans("Send")."\"></center></form>\n";
+	      print "<br><center><input class=\"flat\" type=\"submit\" value=\"".$langs->trans("Send")."\"></center>\n";
+
+          print "</form>\n";
 	    }
 
 	  if ($_GET["action"] == 'prerelance')
 	    {
+	      print_titre("Envoyer une relance par mail");
+
+	      $langs->load("other");
+
 	      $replytoname = $user->fullname;
 	      $from_name = $replytoname;
 
 	      $replytomail = $user->email;
 	      $from_mail = $replytomail;
 	    
+	      $form = new Form($db);	    
+
 	      print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">\n";
 	      print '<input type="hidden" name="facid" value="'.$fac->id.'">';
 	      print '<input type="hidden" name="action" value="relance">';
@@ -1324,24 +1339,26 @@ else
 	      print '<input type="hidden" name="replytomail" value="'.$replytomail.'">';
 	      print '<br>';
 	    
-	      print_titre("Envoyer une relance par mail");
-	      print "<table cellspacing=\"0\" class=\"border\" cellpadding=\"3\" width=\"100%\">";
-	      print "<tr><td>Expéditeur</td><td>$from_name</td><td>$from_mail &nbsp;</td></tr>";
-	      print "<tr><td>Répondre à</td><td>$replytoname</td><td>$replytomail &nbsp;</td></tr>";
-	      print '<tr><td>Destinataire</td><td colspan=\"2\">';
+	      // From
+	      print "<table class=\"border\" width=\"100%\">";
+	      print "<tr><td width=\"180\">".$langs->trans("MailFrom")."</td><td>$from_name".($from_mail?" &lt;$from_mail&gt;":"")."</td></tr>";
+	      print "<tr><td>".$langs->trans("MailReply")."</td><td>$replytoname".($replytomail?" &lt;$replytomail&gt;":"");
+	      print "</td></tr>";
+          print "</table>";
+          
+	      // To
+	      print "<table class=\"border\" width=\"100%\">";
+	      print '<tr><td width=\"180\">'.$langs->trans("MailTo").'</td><td>';
+	      $form->select_array("receiver",$soc->contact_email_array());
+	      print " ".$langs->trans("or")." <input size=\"30\" name=\"sendto\" value=\"$fac->email\"></td></tr>";
 	    
-	      $form = new Form($db);	    
-	      $form->select_array("destinataire",$soc->contact_email_array());
-	      print " ou <input size=\"30\" name=\"sendto\" value=\"$fac->email\"></td></tr>";
-	    
-	      print '<tr><td>'.$langs->trans("Message").'</td><td colspan=\"2\">';
-	      print "<textarea rows=\"5\" cols=\"60\" name=\"message\">";
-	      print "Nous apportons à votre connaissance que la facture ".$fac->ref." ne semble toujours pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n";
-	      print "</textarea></td></tr>";
-
-	      print "</table><br>\n";
-	    
-	      print "<center><input class=\"flat\" type=\"submit\" value=\"".$langs->trans("Send")."\"></center></form>\n";
+          // Affiche la partie mail topic + message + file
+	      $defaultmessage="Nous apportons à votre connaissance que la facture ".$fac->ref." ne semble toujours pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n";
+          $form->mail_topicmessagefile(0,1,0,$defaultmessage);
+        
+          print "<br><center><input class=\"flat\" type=\"submit\" value=\"".$langs->trans("Send")."\"></center>\n";
+        
+          print "</form\n";	
 	    }
 	
 	  /*
@@ -1378,7 +1395,7 @@ else
 		  $var=True;
 		  while ($i < $num)
 		    {
-		      $objp = $db->fetch_object( $i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      print "<tr $bc[$var]>";
 		      print "<td><a href=\"propal.php?propalid=$objp->propalid\">$objp->ref</a></td>\n";
@@ -1501,7 +1518,7 @@ else
 
 	      while ($i < min($num,$limit))
 		{
-		  $objp = $db->fetch_object($i);
+		  $objp = $db->fetch_object();
 		  $var=!$var;
 
 		  print "<tr $bc[$var]>";
diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php
index 162a26cb6f4..e0bc25fc1fa 100644
--- a/htdocs/compta/facture/facture-rec.class.php
+++ b/htdocs/compta/facture/facture-rec.class.php
@@ -154,7 +154,7 @@ class FactureRec
 	{
 	  if ($this->db->num_rows())
 	    {
-	      $obj = $this->db->fetch_object(0);
+	      $obj = $this->db->fetch_object();
 	      
 	      $this->id                 = $rowid;
 	      $this->datep              = $obj->dp;
@@ -199,7 +199,7 @@ class FactureRec
 		  
 		  while ($i < $num)
 		    {
-		      $objp = $this->db->fetch_object($i);
+		      $objp = $this->db->fetch_object($result);
 		      $faclig = new FactureLigne($this->db);
 		      $faclig->produit_id     = $objp->fk_product;
 		      $faclig->desc           = stripslashes($objp->description);
@@ -333,7 +333,7 @@ class FactureRec
 	      $i = 0;
 	      while ($i < $num)	  
 		{
-		  $obj = $this->db->fetch_object($i);
+		  $obj = $this->db->fetch_object($result);
 		  
 		  $sql = "UPDATE ".MAIN_DB_PREFIX."product SET nbvente=nbvente+1 WHERE rowid = ".$obj->fk_product;
 		  $db2 = $this->db->clone();
@@ -467,7 +467,7 @@ class FactureRec
 	  $i = 0;
 	  while ($i < $num)	  
 	    {
-	      $obj = $this->db->fetch_object($i);
+	      $obj = $this->db->fetch_object($result);
 
 	      $products[$i][0] = $obj->price;
 	      $products[$i][1] = $obj->qty;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index fa71ebfffe9..df6336fc0c9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -164,7 +164,7 @@ if ($_GET["action"] == 'create')
 	  $var=True;
 	  while ($i < $num)
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 
 	      if ($objp->fk_product > 0)
 		{
@@ -435,7 +435,7 @@ else
 	    $var=True;
 	    while ($i < min($num,$limit))
 	      {
-		$objp = $db->fetch_object($i);
+		$objp = $db->fetch_object();
 		$var=!$var;
 
 		print "<tr $bc[$var]>";
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index 2899dc3ad83..69406756c0f 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -125,7 +125,7 @@ if ($mode == 'search')
     {
         if ( $db->num_rows() == 1)
         {
-            $obj = $db->fetch_object(0);
+            $obj = $db->fetch_object();
             $socid = $obj->idp;
         }
         $db->free();
@@ -260,7 +260,7 @@ if ($socid > 0)
 
             while ($i < $num && $i < 5)
             {
-                $objp = $db->fetch_object( $i);
+                $objp = $db->fetch_object();
                 $var=!$var;
                 print "<tr $bc[$var]>";
                 print "<td><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a></td>\n";
@@ -306,7 +306,7 @@ if ($socid > 0)
 	  }
         while ($i < $num && $i < 5)
 	  {
-	    $obj = $db->fetch_object( $i);
+	    $obj = $db->fetch_object();
 	    $tag = !$tag;
             print "<tr $bc[$tag]>";
             print '<td><a href="../projet/fiche.php?id='.$obj->rowid.'">'.$obj->title.'</a></td>';
@@ -388,7 +388,7 @@ if ($socid > 0)
         $var=1;
         while ($i < $num)
         {
-            $obj = $db->fetch_object( $i);
+            $obj = $db->fetch_object($result);
             $var = !$var;
 
             print "<tr $bc[$var]>";
@@ -449,7 +449,7 @@ if ($socid > 0)
             while ($i < $num) {
                 $var = !$var;
 
-                $obj = $db->fetch_object( $i);
+                $obj = $db->fetch_object();
                 print "<tr $bc[$var]>";
 
                 if ($oldyear == strftime("%Y",$obj->da) ) {
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 68ac9ee5fd6..ee38a3c42f2 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -109,7 +109,7 @@ if ($conf->facture->enabled)
 	  $var = True;
 	  while ($i < $num && $i < 20)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      $var=!$var;
 	      print '<tr '.$bc[$var].'><td width="92"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>&nbsp;';
 	      print '<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
@@ -151,7 +151,7 @@ if ($user->societe_id == 0)
 	  $var = True;
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      $var = !$var;
 	      print "<tr $bc[$var]>";
 	      print '<td>'.$obj->libelle.'</td>';
@@ -191,7 +191,7 @@ if ( $db->query($sql) )
       $var = True;
       while ($i < $num)
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object();
 	  $var = !$var;
 	  print "<tr $bc[$var]>";
 	  print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
@@ -237,7 +237,7 @@ if ($user->comm > 0 && $conf->commercial->enabled )
 	  while ($i < $num)
 	    {
 	      $var=!$var;
-	      $obj = $db->fetch_object($i);
+	      $obj = $db->fetch_object();
 	      print "<tr $bc[$var]><td width=\"20%\"><a href=\"commande.php?id=$obj->rowid\">".img_file()."</a>";
 	      print "&nbsp;<a href=\"commande.php?id=$obj->rowid\">$obj->ref</a></td>";
 	      print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -279,7 +279,7 @@ if ($conf->facture->enabled)
 	  $total = $totalam = 0;
 	  while ($i < $num && $i < 20)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      $var=!$var;
 	      print '<tr '.$bc[$var].'><td width="20%"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>';
 	      print '&nbsp;<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
@@ -313,7 +313,7 @@ if ( $result )
   $i = 0;
   while ($i < $db->num_rows() )
     {
-      $obj = $db->fetch_object($i);
+      $obj = $db->fetch_object();
       $var=!$var;
       
       print "<tr $bc[$var]><td>".strftime("%d %b %Y",$obj->da)."</td><td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
@@ -345,7 +345,7 @@ if ($user->societe_id == 0)
       $num = $db->num_rows();
       if ($num)
 	{
-	  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	  print '<table class="noborder" width="100%">';
       print '<tr class="liste_titre"><td colspan="2">Factures fournisseurs à payer</td><td align="right">Montant TTC</td></tr>';
 	  print "</tr>\n";
 	  $i = 0;
@@ -353,7 +353,7 @@ if ($user->societe_id == 0)
 	  $total = $totalam = 0;
 	  while ($i < $num)
 	    {
-	      $obj = $db->fetch_object( $i);
+	      $obj = $db->fetch_object();
 	      $var = !$var;
     	  print '<tr '.$bc[$var].'><td width="20%"><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.img_file().'</a>';
 	      print '&nbsp;<a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
diff --git a/htdocs/compta/ligne.php b/htdocs/compta/ligne.php
index 9d2f269a591..b00e6c29208 100644
--- a/htdocs/compta/ligne.php
+++ b/htdocs/compta/ligne.php
@@ -30,7 +30,7 @@ if ( $db->query($sql) ) {
   $i = 0;
   $options = "<option value=\"0\" SELECTED></option>";
   while ($i < $num) {
-    $obj = $db->fetch_object($i);
+    $obj = $db->fetch_object();
     $options .= "<option value=\"$obj->rowid\">$obj->number</option>\n"; $i++;
   }
   $db->free();
@@ -99,7 +99,7 @@ if ($action == 'create') {
     if ($num > 0) {
 	$var=True;
 	while ($i < $num) {
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	
 	  print "<TR $bc[$var]>";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 34f7dd628c7..0a2c08f92c7 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -146,7 +146,7 @@ if ($_GET["action"] == 'create')
       $num = $db->num_rows();
       if ($num)
 	{
-	  $obj = $db->fetch_object( 0);
+	  $obj = $db->fetch_object($result);
 
 	  $total = $obj->total;
 
@@ -179,7 +179,7 @@ if ($_GET["action"] == 'create')
 	      $i = 0; 
 	      while ($i < $num)
 		{
-		  $objopt = $db->fetch_object( $i);
+		  $objopt = $db->fetch_object($result);
 		  print "<option value=\"$objopt->id\">$objopt->libelle</option>\n";
 		  $i++;
 		}
@@ -203,7 +203,7 @@ if ($_GET["action"] == 'create')
 	      $i = 0; 
 	      while ($i < $num)
 		{
-		  $objopt = $db->fetch_object( $i);
+		  $objopt = $db->fetch_object($result);
 		  print '<option value="'.$objopt->rowid.'"';
 		  if (defined("FACTURE_RIB_NUMBER") && FACTURE_RIB_NUMBER == $objopt->rowid)
 		    {
@@ -237,7 +237,7 @@ if ($_GET["action"] == 'create')
 		{
 		  $i = 0;
 		  print '<tr><td colspan="3">';
-		  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+		  print '<table class="noborder" width="100%">';
 		  print '<tr class="liste_titre">';
 		  print '<td>Facture</td><td align="center">Date</td>';
 		  print '<td align="right">Montant TTC</td>';	      
@@ -252,7 +252,7 @@ if ($_GET["action"] == 'create')
 		  
 		  while ($i < $num)
 		    {
-		      $objp = $db->fetch_object($i);
+		      $objp = $db->fetch_object();
 		      $var=!$var;
 		      
 		      print "<tr $bc[$var]>";
@@ -363,7 +363,7 @@ if ($action == '')
       
       print_barre_liste("Paiements", $page, "paiement.php","",$sortfield,$sortorder,'',$num);
 
-      print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">';
+      print '<TABLE border="0" width="100%">';
       print '<TR class="liste_titre">';
       print "<td>Facture</td>";
       print "<td>Date</td>";
@@ -375,7 +375,7 @@ if ($action == '')
       
       while ($i < min($num,$limit))
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object();
 	  $var=!$var;
 	  print "<TR $bc[$var]>";
 	  print "<TD><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n";
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index c4eeb0e8a52..a2726db4af6 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -123,7 +123,7 @@ if ($db->query($sql))
       
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object($i);
+	  $objp = $db->fetch_object();
 	  $var=!$var;
 	  
 	  print "<tr $bc[$var]>";
diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php
index fe5198d116b..943b01918f7 100644
--- a/htdocs/compta/paiement/liste.php
+++ b/htdocs/compta/paiement/liste.php
@@ -65,17 +65,17 @@ if ($result)
   
   print_barre_liste("Paiements reçus", $page, "liste.php","",$sortfield,$sortorder,'',$num);
   
-  print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
+  print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
   print '<td>Date</td><td>';
   print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","","");
-  print '</td><td align="right">Montant</TD>';
+  print '</td><td align="right">'.$langs->trans("Amount").'</td>';
   print "<td>&nbsp;</td>";
   print "</tr>\n";
   
   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.'">';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 00457d0b090..aaab7c7b750 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -193,7 +193,7 @@ if ($_GET["action"] == 'create')
 	      $i = 0; 
 	      while ($i < $num)
 		{
-		  $objopt = $db->fetch_object( $i);
+		  $objopt = $db->fetch_object($result);
 		  print "<option value=\"$objopt->id\">$objopt->libelle</option>\n";
 		  $i++;
 		}
@@ -216,7 +216,7 @@ if ($_GET["action"] == 'create')
 	      $i = 0; 
 	      while ($i < $num)
 		{
-		  $objopt = $db->fetch_object( $i);
+		  $objopt = $db->fetch_object($result);
 		  print '<option value="'.$objopt->rowid.'"';
 		  if (defined("FACTURE_RIB_NUMBER") && FACTURE_RIB_NUMBER == $objopt->rowid)
 		    {
@@ -253,7 +253,7 @@ if ($_GET["action"] == 'create')
 		  $num = 1;
 		  $i = 0;
 		  print '<tr><td colspan="3">';
-		  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+		  print '<table class="noborder" width="100%">';
 		  print '<tr class="liste_titre">';
 		  print '<td>Charge</td><td align="center">Date échéance</td>';
 		  print '<td align="right">Montant TTC</td>';	      
diff --git a/htdocs/compta/pmt.php b/htdocs/compta/pmt.php
index 83d07c3d211..ff10ab332e6 100644
--- a/htdocs/compta/pmt.php
+++ b/htdocs/compta/pmt.php
@@ -52,12 +52,10 @@ $result = $db->query($sql);
 
 if ($result) {
 
-
-
-  print "<table class=\"noborder\" cellspacing=\"0\" cellpadding=\"3\">";
+  print "<table class=\"noborder\">";
   print "<tr bgcolor=\"orange\">";
   print "<td>".$langs->trans("Month")."</td>";
-  print "<td align=\"right\">Montant</td>";
+  print "<td align=\"right\">".$langs->trans("Amount")."</td>";
   print "</tr>\n";
 
   $bc[0]="bgcolor=\"#90c090\"";
@@ -67,16 +65,16 @@ if ($result) {
   $i = 0;
   $num = $db->num_rows();
   while ($i < $num) {
-  $obj = $db->fetch_object( $i);
+  $obj = $db->fetch_object($result);
     $var=!$var;
     
-    print "<TR $bc[$var]>";
+    print "<tr $bc[$var]>";
     
-    print "<TD>".strftime("%Y %B",$obj->dm)."</TD>\n";
-    print "<TD align=\"right\">$obj->amount</TD>\n";
+    print "<td>".strftime("%Y %B",$obj->dm)."</td>\n";
+    print "<td align=\"right\">$obj->amount</td>\n";
 
 
-    print "</TR>\n";
+    print "</tr>\n";
 
 
     $i++;
diff --git a/htdocs/compta/pointmort.php b/htdocs/compta/pointmort.php
index 2382bd2f7c9..4878b92835a 100644
--- a/htdocs/compta/pointmort.php
+++ b/htdocs/compta/pointmort.php
@@ -30,7 +30,7 @@ function pt ($db, $sql) {
     $total = 0 ;
     $month = 1 ;
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
 
       $ca[$obj->dm] = $obj->sum;
       
@@ -51,7 +51,7 @@ function pm ($db) {
 
     $month = 1 ;
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
 
       $ca[$obj->dm] = $obj->amount;
       
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 7ff03899606..2405491e20c 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -115,7 +115,7 @@ if ($_GET["propalid"])
   $result = $db->query($sql);
 
   if ( $result ) {
-    $obj = $db->fetch_object( 0 );
+    $obj = $db->fetch_object($result);
     
     if ($db->num_rows()) {
             
@@ -233,7 +233,7 @@ if ($_GET["propalid"])
 	  $var=True;
 	  while ($i < $num_fac_asso)
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 	      $var=!$var;
 	      print "<TR bgcolor=\"#e0e0e0\">";
 	      print "<TD><a href=\"../compta/facture.php?facid=$objp->facid\">$objp->facnumber</a>";
@@ -323,7 +323,7 @@ if ($_GET["propalid"])
 	$var=True;	
 	while ($i < $num) 
 	  {
-	    $objp = $db->fetch_object($i);
+	    $objp = $db->fetch_object();
 	    $var=!$var;
 	    print "<tr $bc[$var]><td>[$objp->ref]</TD>\n";
 	    print '<td><a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->prodid.'">'.$objp->product.'</td>';
@@ -343,7 +343,7 @@ if ($_GET["propalid"])
 	$i = 0;	
 	while ($i < $num) 
 	  {
-	    $objp = $db->fetch_object($i);
+	    $objp = $db->fetch_object();
 	    $var=!$var;
 	    print "<tr $bc[$var]><td>&nbsp;</td>\n";
 	    print '<td>'.$objp->product.'</td>';
@@ -474,7 +474,7 @@ if ($_GET["propalid"])
 
       while ($i < min($num, $limit))
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object();
 	
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 0f64f7e05b5..f4a512ab3ea 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -73,7 +73,7 @@ if ($result) {
   if ($num > 0) {
     $var=True;
     while ($i < $num) {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
             
       print "<tr $bc[$var]><td>&nbsp</td>";
@@ -114,7 +114,7 @@ if ($result) {
   if ($num > 0) {
     $var=True;
     while ($i < $num) {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $var=!$var;
             
       print "<tr $bc[$var]><td>&nbsp</td>";
@@ -155,7 +155,7 @@ if ( $db->query($sql) ) {
   $i = 0;
 
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
 
     $total = $total - $obj->amount;
     $subtotal = $subtotal + $obj->amount;
@@ -195,7 +195,7 @@ if ( $db->query($sql) ) {
   $i = 0;
 
   while ($i < $num) {
-    $obj = $db->fetch_object( $i);
+    $obj = $db->fetch_object();
 
     $total = $total - $obj->amount;
     $subtotal = $subtotal + $obj->amount;
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index dafa3d6eed2..244a8f4b96c 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -122,7 +122,7 @@ if ($chid > 0)
     	    $var=True;
     	    while ($i < $num)
     	      {
-    		$objp = $db->fetch_object( $i);
+    		$objp = $db->fetch_object($result);
     		$var=!$var;
     		print "<tr $bc[$var]><td>";
     		print dolibarr_print_date($objp->dp)."</td>\n";
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index ce6abecd383..f3a23f803ea 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -141,7 +141,7 @@ if ($user->rights->compta->charges->creer) {
     
       while ($i < $num)
         {
-          $obj = $db->fetch_object( $i);
+          $obj = $db->fetch_object();
           print '<option value="'.$obj->id.'">'.$obj->type;
           $i++;
         }
@@ -217,7 +217,7 @@ if ( $db->query($sql) )
 
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
 
       $var = !$var;
       print "<tr $bc[$var]>";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 61b0a35935f..8ea19b3a436 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -55,7 +55,7 @@ if ($result)
 {
   if ($db->num_rows() > 0)
     {
-      $objp = $db->fetch_object(0);
+      $objp = $db->fetch_object($result);
       $catotal = $objp->ca;
     }
 }
@@ -84,7 +84,7 @@ if ($result)
   if ($num > 0)
     {
       $i = 0;
-      print "<p><table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
+      print "<p><table class=\"noborder\" width=\"100%\">";
       print "<tr class=\"liste_titre\">";
       print "<td>Utilisateur</td>";
       print '<td align="right">Montant</TD><td align="right">Pourcentage</td>';
@@ -92,7 +92,7 @@ if ($result)
       $var=True;
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
 	  
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 965dc30c366..d26a1baf508 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -55,7 +55,7 @@ if ($result)
 {
   if ($db->num_rows() > 0)
     {
-      $objp = $db->fetch_object(0);
+      $objp = $db->fetch_object($result);
       $catotal = $objp->ca;
     }
 }
@@ -95,7 +95,7 @@ if ($result)
       $var=True;
       while ($i < $num)
 	{
-	  $objp = $db->fetch_object( $i);
+	  $objp = $db->fetch_object($result);
 	  $var=!$var;
 	  print "<tr $bc[$var]>";
 	  
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index 01d3b63e9b5..e23dd5a5ef8 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -44,7 +44,7 @@ function propals ($db, $year, $month) {
   $oldstatut = -1;
   $subtotal = 0;
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
 
     if ($objp->statut <> $oldstatut ) {
       $oldstatut = $objp->statut;
@@ -127,7 +127,7 @@ function factures ($db, $year, $month, $paye) {
 	  $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=\"comp.php?socidp=$objp->idp\">$objp->nom</a></td>\n";
@@ -181,7 +181,7 @@ function pt ($db, $sql, $year) {
     $month = 1 ;
 
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       if ($obj->dm > $month ) {
diff --git a/htdocs/compta/stats/cumul.php b/htdocs/compta/stats/cumul.php
index 22b98eaef02..fed12e5c24f 100644
--- a/htdocs/compta/stats/cumul.php
+++ b/htdocs/compta/stats/cumul.php
@@ -101,7 +101,7 @@ function pt ($db, $sql, $date)
       $var=True;
       while ($i < $num) 
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object($result);
 	  $var=!$var;
 	  $total = $total + $obj->amount;
 	  print "<tr $bc[$var]>";
diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php
index 068e4ea88be..18f8b83ffb7 100644
--- a/htdocs/compta/stats/exercices.php
+++ b/htdocs/compta/stats/exercices.php
@@ -71,7 +71,7 @@ function factures ($db, $year, $month, $paye)
       print "</TR>\n";
       $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=\"comp.php?socidp=$objp->idp\">$objp->nom</a></TD>\n";
@@ -118,7 +118,7 @@ function pt ($db, $sql, $year) {
     $month = 1 ;
 
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
 
       if ($obj->dm > $month ) {
diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php
index 5c4c0b94764..12321b83716 100644
--- a/htdocs/compta/stats/prev.php
+++ b/htdocs/compta/stats/prev.php
@@ -35,10 +35,11 @@ function pt ($db, $sql, $title) {
   global $bc;
   global $langs;
 
-  print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
+  print '<table class="border" width="100%">';
   print '<tr class="liste_titre">';
-  print "<TD>$title</TD>";
-  print "<TD align=\"right\">Montant</TD>";
+  print "<td>$title</td>";
+  print "<td align=\"right\">Montant</td>";
+  print "</tr>\n";
   
   $result = $db->query($sql);
   if ($result) 
@@ -46,17 +47,16 @@ function pt ($db, $sql, $title) {
       $num = $db->num_rows();
       $i = 0; $total = 0 ;
     
-      print "</TR>\n";
       $var=True;
       while ($i < $num) 
 	{
-	  $obj = $db->fetch_object( $i);
+	  $obj = $db->fetch_object($result);
 	  $var=!$var;
-	  print '<TR '.$bc[$var].'>';
-	  print '<TD>'.$obj->dm.'</TD>';
-	  print '<TD align="right">'.price($obj->amount).'</TD>';
+	  print '<tr '.$bc[$var].'>';
+	  print '<td>'.$obj->dm.'</td>';
+	  print '<td align="right">'.price($obj->amount).'</td>';
 	  
-	  print "</TR>\n";
+	  print "</tr>\n";
 	  $total = $total + $obj->amount;
 	  $i++;
 	}
@@ -66,10 +66,10 @@ function pt ($db, $sql, $title) {
     } 
   else 
     {
-      print "<tr><td>".$db->error() . "</td></tr>";
+      dolibarr_print_error($db);
 
     }
-  print "</TABLE>";
+  print "</table>";
       
 }
 /*
diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php
index f5f89a05c96..fced5772b01 100644
--- a/htdocs/compta/tva.php
+++ b/htdocs/compta/tva.php
@@ -36,7 +36,7 @@ function pt ($db, $sql, $date) {
   if ($result) {
     $num = $db->num_rows();
     $i = 0; $total = 0 ;
-    print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
+    print "<TABLE border=\"1\" width=\"100%\">";
     print "<TR class=\"liste_titre\">";
     print "<TD width=\"60%\">$date</TD>";
     print "<TD align=\"right\">Montant</TD>";
@@ -44,7 +44,7 @@ function pt ($db, $sql, $date) {
     print "</TR>\n";
     $var=True;
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
       print "<TR $bc[$var]>";
       print "<TD>$obj->dm</TD>\n";
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index b4cbf343e0e..b3b8f2edaf5 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -36,7 +36,7 @@ function tva_coll($db, $y,$m) {
 
   $result = $db->query($sql);
   if ($result) {
-    $obj = $db->fetch_object ( 0 );
+    $obj = $db->fetch_object($result);
     return $obj->amount;
   }
 }
@@ -54,7 +54,7 @@ function tva_paye($db, $y,$m)
   $result = $db->query($sql);
   if ($result)
     {
-      $obj = $db->fetch_object ( 0 );
+      $obj = $db->fetch_object($result);
       return $obj->amount;
     }
 }
@@ -75,7 +75,7 @@ function pt ($db, $sql, $date) {
     print "</tr>\n";
     $var=True;
     while ($i < $num) {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td nowrap>$obj->dm</td>\n";
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 55e2d639393..ac04c0b66bb 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -44,7 +44,7 @@ if ($result)
   $i = 0; 
   $total = 0 ;
   print '<br>';
-  print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
+  print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
   print "<td width=\"60%\">".$langs->trans("Date")."</td>";
   print "<td align=\"right\">".$langs->trans("Amount")."</td>";
@@ -53,7 +53,7 @@ if ($result)
   $var=1;
   while ($i < $num)
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td>".dolibarr_print_date($obj->dm)."</td>\n";
diff --git a/htdocs/compta/voyage/bilan.php b/htdocs/compta/voyage/bilan.php
index 891aa4c9596..37340742531 100644
--- a/htdocs/compta/voyage/bilan.php
+++ b/htdocs/compta/voyage/bilan.php
@@ -61,7 +61,7 @@ if ($result) {
   $i = 0;
   $options = "<option value=\"0\" SELECTED></option>";
   while ($i < $num) {
-    $obj = $db->fetch_object($i);
+    $obj = $db->fetch_object($result);
     $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
   }
   $db->free();
@@ -80,7 +80,7 @@ if ($result) {
   $cartes= array();
   $i = 0;
   while ($i < $num) {
-    $obj = $db->fetch_object($i);
+    $obj = $db->fetch_object($result);
     $cartes[$i] = $obj->rowid;
     $i++;
   }
@@ -128,7 +128,7 @@ for ($j = 0 ; $j < sizeof($cartes) ; $j++) {
     $total_reduc = 0;
 
     while ($i < $num) {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object($result);
       $total = $total + $objp->amount;
       $total_reduc = $total_reduc + $objp->reduction;
       $time = time();
diff --git a/htdocs/compta/voyage/index.php b/htdocs/compta/voyage/index.php
index d596e68bcc1..bc5c0dfce73 100644
--- a/htdocs/compta/voyage/index.php
+++ b/htdocs/compta/voyage/index.php
@@ -60,7 +60,7 @@ if ($result) {
   $i = 0;
   $options = "<option value=\"0\" SELECTED></option>";
   while ($i < $num) {
-    $obj = $db->fetch_object($i);
+    $obj = $db->fetch_object($result);
     $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
   }
   $db->free();
@@ -93,7 +93,7 @@ if ($result) {
   $sep = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
     $total = $total + $objp->amount;
     $time = time();
 
diff --git a/htdocs/compta/voyage/reduc.class.php b/htdocs/compta/voyage/reduc.class.php
index b81f6bf3bef..6bc47b570c3 100644
--- a/htdocs/compta/voyage/reduc.class.php
+++ b/htdocs/compta/voyage/reduc.class.php
@@ -42,7 +42,7 @@ class Reduc {
 
     if ($result) {
       if ($this->db->num_rows()) {
-	$obj = $this->db->fetch_object( 0);
+	$obj = $this->db->fetch_object($result);
 
 	$this->id = $obj->rowid;
 	$this->price = $obj->amount;
diff --git a/htdocs/compta/voyage/reduc.php b/htdocs/compta/voyage/reduc.php
index e399599cbe7..e305d05fb06 100644
--- a/htdocs/compta/voyage/reduc.php
+++ b/htdocs/compta/voyage/reduc.php
@@ -46,7 +46,7 @@ if ($result) {
   $sep = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
     $total = $total + $objp->amount;
     $time = time();
 
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index 4e1e8d813ff..ee8929a2acb 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -148,7 +148,7 @@ if ($result)
     {
       $sortorder="DESC";
     }
-  print '<p><table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+  print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre"><td>';
   print_liste_field_titre($langs->trans("Lastname"),"index.php","lower(p.name)", $begin);
   print "</td><td>";
@@ -173,7 +173,7 @@ if ($result)
   $var=True;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object($result);
     
       $var=!$var;
 
@@ -183,7 +183,7 @@ if ($result)
       print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">';
       print img_file();
       print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">'.$obj->name.'</a></td>';
-      print "<TD>$obj->firstname</TD>";
+      print "<td>$obj->firstname</TD>";
       
       print '<td>';
       if ($obj->nom)
@@ -225,8 +225,7 @@ if ($result)
 }
 else
 {
-  print $db->error();
-  print "<br>".$sql;
+  dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php
index 5383da7f0af..49a59d0f172 100644
--- a/htdocs/contrat/contrat.class.php
+++ b/htdocs/contrat/contrat.class.php
@@ -185,7 +185,7 @@ class Contrat
 	  
 	      while ($i < $num)
 		{
-		  $objp = $this->db->fetch_object($i);
+		  $objp = $this->db->fetch_object();
 		  $prowid[$i] = $objp->rowid;
 		  $fdrowid[$i] = $objp->fdrowid;
 		  $i++;
diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php
index 99f58fbaf8b..4980b144de0 100644
--- a/htdocs/contrat/enservice.php
+++ b/htdocs/contrat/enservice.php
@@ -84,7 +84,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td><a href=\"fiche.php?id=$obj->cid\">$obj->label</a></td>\n";
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 3af96eb685a..d4843e809d9 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -110,7 +110,7 @@ if ( $db->query($sql) )
   $var=True;
   while ($i < min($num,$limit))
     {
-      $obj = $db->fetch_object( $i);
+      $obj = $db->fetch_object();
       $var=!$var;
       print "<tr $bc[$var]>";
       print "<td><a href=\"fiche.php?id=$obj->cid\">";
diff --git a/htdocs/domain/index.php b/htdocs/domain/index.php
index 684190b5d4e..505ff4b6a30 100644
--- a/htdocs/domain/index.php
+++ b/htdocs/domain/index.php
@@ -63,10 +63,10 @@ if ($result) {
 
   print "<form method=\"post\" action=\"index.php?viewall=$viewall&vline=$vline&account=$account\">";
   print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-  print "<table class=\"border\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
+  print "<table class=\"border\" width=\"100%\">";
   print "<tr class=\"liste_titre\">";
   print '<td>Date</td><td>'.$langs->trans("Description").'</td>';
-  print "<td align=\"right\">Montant</TD>";
+  print '<td align="right">'.$langs->trans("Amount").'</td>';
   print "<td align=\"right\">Réduction</td>";
   print "</tr>\n";
   
@@ -78,7 +78,7 @@ if ($result) {
   $sep = 0;
 
   while ($i < $num) {
-    $objp = $db->fetch_object( $i);
+    $objp = $db->fetch_object($result);
     $total = $total + $objp->amount;
     $time = time();
 
@@ -88,7 +88,7 @@ if ($result) {
 
     print "<td>$objp->label</td>";
 
-    print '<td><a href="http://www.'.$objp->label.'/">www.'.$objp->label.'</a></TD>';
+    print '<td><a href="http://www.'.$objp->label.'/">www.'.$objp->label.'</a></td>';
 
     print "</tr>";
 
@@ -97,12 +97,10 @@ if ($result) {
   }
   $db->free();
 
-
-
   print "</table></form>";
-} else {
-  print "<p>".$db->error();
 
+} else {
+  dolibarr_print_error($db);
 }
 
 
diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php
index f1606bbe770..4f9d0618fae 100644
--- a/htdocs/expedition/commande.php
+++ b/htdocs/expedition/commande.php
@@ -156,7 +156,7 @@ if ($_GET["id"] > 0)
 	  $reste_a_livrer = array();
 	  while ($i < $num)
 	    {
-	      $objp = $db->fetch_object( $i);
+	      $objp = $db->fetch_object();
 	      print "<TR $bc[$var]>";
 	      if ($objp->fk_product > 0)
 		{
@@ -258,7 +258,7 @@ if ($_GET["id"] > 0)
 		      $var=True;
 		      while ($i < $num)
 			{
-			  $obja = $db->fetch_object( $i);
+			  $obja = $db->fetch_object($result);
 			  print "<tr $bc[$var]>";
 			  print '<td width="54%">'.$obja->label.'</td><td>'.$obja->entrepot.'</td><td><b>Stock : '.$obja->reel.'</b></td>';
 			  print "</tr>\n";
@@ -302,7 +302,7 @@ if ($_GET["id"] > 0)
 	      
 	  if ($num)
 	    {
-	      print '<br><table class="liste" cellpadding="3" width="100%"><tr>';
+	      print '<br><table class="liste" width="100%"><tr>';
 	      print '<tr class="liste_titre">';
 	      print '<td width="54%">'.$langs->trans("Description").'</td>';
 	      print '<td align="center">Quan. livrée</td>';
@@ -313,7 +313,7 @@ if ($_GET["id"] > 0)
 	      $var=True;
 	      while ($i < $num)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object();
 		  print "<TR $bc[$var]>";
 		  if ($objp->fk_product > 0)
 		    {
diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index b4e376b225d..e65614c241f 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -246,7 +246,7 @@ class Expedition
 		  while($i < $num)
 		    {
 		      $mouvS = new MouvementStock($this->db);
-		      $obj = $this->db->fetch_object($i);
+		      $obj = $this->db->fetch_object();
 		      $mouvS->livraison($user, $obj->fk_product, $this->entrepot_id, $obj->qty, 0);
 		      $i++;
 		    }
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index ac7116995f3..3521e4183c0 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -377,7 +377,7 @@ else
 	      $var=True;
 	      while ($i < $num)
 		{
-		  $objp = $db->fetch_object( $i);
+		  $objp = $db->fetch_object($result);
 		  print "<TR $bc[$var]>";
 		  if ($objp->fk_product > 0)
 		    {
@@ -459,7 +459,7 @@ else
 		$var=True;
 		while ($i < $num)
 		  {
-		    $objp = $db->fetch_object( $i);
+		    $objp = $db->fetch_object($result);
 		    print "<TR $bc[$var]>";
 		    if ($objp->fk_product > 0)
 		      {
@@ -521,7 +521,7 @@ else
 		    $var=True;
 		    while ($i < $num)
 		      {
-			$objp = $db->fetch_object( $i);
+			$objp = $db->fetch_object($result);
 			$var=!$var;
 			print "<tr $bc[$var]>";
 			print "<td>".strftime("%d %B %Y",$objp->da)."</TD>\n";
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 8b3b3702c74..6a41333ae56 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -68,7 +68,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
 	  print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>';
@@ -104,7 +104,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"20%\"><a href=\"commande.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"commande.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -146,7 +146,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"20%\"><a href=\"commande.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"commande.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
@@ -182,7 +182,7 @@ if ( $db->query($sql) )
       while ($i < $num)
 	{
 	  $var=!$var;
-	  $obj = $db->fetch_object($i);
+	  $obj = $db->fetch_object();
 	  print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">".img_file()."</a>&nbsp;";
 	  print "<a href=\"fiche.php?id=$obj->rowid\">$obj->ref</a></td>";
 	  print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index 0e040385057..6d1680a7222 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -100,7 +100,7 @@ if ( $db->query($sql) )
   
   while ($i < min($num,$limit))
     {
-      $objp = $db->fetch_object( $i);
+      $objp = $db->fetch_object();
       
       $var=!$var;
       print "<tr $bc[$var]>";