diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php
index 701e84b1f66..a167d7c7850 100644
--- a/htdocs/adherents/adherent.class.php
+++ b/htdocs/adherents/adherent.class.php
@@ -167,7 +167,7 @@ class Adherent
 
 
 /*!
-		\brief fonction qui renvoie la nature physique ou morale d'un adherent
+		\brief  fonction qui renvoie la nature physique ou morale d'un adherent
 		\param	morphy		nature physique ou morale de l'adhérent
 */
 
@@ -180,7 +180,7 @@ class Adherent
   }
 
 /*!
-		\brief fonction qui vérifie les données entrées
+		\brief  fonction qui vérifie les données entrées
 		\param	minimum
 */
 
@@ -265,7 +265,6 @@ class Adherent
       
       /*
        * Return errors
-       *
        */
 
       if ($err)
@@ -281,7 +280,7 @@ class Adherent
     }
 
 /*!
-		\brief fonction qui crée l'adhérent
+		\brief  fonction qui crée l'adhérent
 		\param	userid		userid de l'adhérent
 */
 
@@ -305,16 +304,15 @@ class Adherent
 	}
       else
 	{
-	  print $this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+      dolibarr_print_error($this->db);
 	  return 0;
 	}  
     }
 
+
 /*!
 		\brief fonction qui met à jour l'adhérent
 */
-
   function update() 
     {
 
@@ -343,8 +341,7 @@ class Adherent
     
       if (!$result)
 	{
-	  print $this->db->error();
-	  print "<br>$sql<br>";
+      dolibarr_print_error($this->db);
 	  return 0;
 	}
 
@@ -352,14 +349,21 @@ class Adherent
 	{
 	  $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."adherent_options WHERE adhid = $this->id;";
 		$this->db->query($sql_del);
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options (adhid) VALUES ($this->id);";
-	  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."adherent_options SET adhid = $this->id";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options (adhid";
 	  foreach($this->array_options as $key => $value)
 	    {
 	      // recupere le nom de l'attribut
 	      $attr=substr($key,8);
-	      $sql.=",$attr = '".$this->array_options[$key]."'";
+	      $sql.=",$attr";
 	    }
+	  $sql .= ") VALUES ($this->id";
+	  foreach($this->array_options as $key => $value)
+	    {
+
+	      $sql.=",'".$this->array_options[$key]."'";
+        }
+      $sql.=");";
+
 	  $result = $this->db->query($sql);
 	}
 	
@@ -369,8 +373,7 @@ class Adherent
 	}
       else
 	{
-	  print $this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+      dolibarr_print_error($this->db);
 	  return 0;
 	}  
     }
@@ -411,7 +414,7 @@ class Adherent
       }
     else
       {
-	print "Err : ".$this->db->error();
+      dolibarr_print_error($this->db);
       }
 
     return $result;
@@ -436,7 +439,7 @@ class Adherent
       }
     else
       {
-	print $this->db->error();
+      dolibarr_print_error($this->db);
       }
   }
 
@@ -485,7 +488,7 @@ class Adherent
       }
     else
       {
-	print $this->db->error();
+      dolibarr_print_error($this->db);
       }
     
   }
@@ -516,7 +519,7 @@ class Adherent
 	  }
 	}
     }else{
-      print $this->db->error();
+      dolibarr_print_error($this->db);
     }
     
   }
@@ -544,7 +547,7 @@ class Adherent
 	return array();
       }
     }else{
-      print $this->db->error();
+      dolibarr_print_error($this->db);
       return array() ;
     }
     
@@ -586,7 +589,7 @@ class Adherent
       }
     else
       {
-	print "Err : ".$this->db->error();
+      dolibarr_print_error($this->db);
 	return 0;
       }
   }
@@ -613,8 +616,7 @@ class Adherent
 	}
       else
 	{
-	  print $this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+      dolibarr_print_error($this->db);
 	  return 0;
 	}
     }
@@ -641,8 +643,7 @@ class Adherent
 	}
       else
 	{
-	  print $this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+      dolibarr_print_error($this->db);
 	  return 0;
 	}
     }
diff --git a/htdocs/adherents/adherent_options.class.php b/htdocs/adherents/adherent_options.class.php
index c65da06bdb7..3125a69bfad 100644
--- a/htdocs/adherents/adherent_options.class.php
+++ b/htdocs/adherents/adherent_options.class.php
@@ -161,8 +161,7 @@ class AdherentOptions
 	}
       else
 	{
-	  print $this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+	  dolibarr_print_error($this->db);
 	  return 0;
 	}
     }else{
@@ -173,7 +172,7 @@ class AdherentOptions
 /*!
 		\brief fonction qui crée un label
 		\param	attrname			nom de l'atribut
-		\param	label					nom du label
+		\param	label				nom du label
 */
 
   function create_label($attrname,$label='') {
@@ -213,8 +212,7 @@ class AdherentOptions
 	}
       else
 	{
-	  print "Err : ".$this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+   	  print dolibarr_print_error($this->db);
 	  return 0;
 	}
     }else{
@@ -239,8 +237,7 @@ class AdherentOptions
 	}
       else
 	{
-	  print "Err : ".$this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+   	  print dolibarr_print_error($this->db);
 	  return 0;
 	}
     }else{
@@ -282,8 +279,7 @@ class AdherentOptions
 	}
       else
 	{
-	  print "Err : ".$this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+   	  print dolibarr_print_error($this->db);
 	  return 0;
 	}
     }else{
@@ -315,8 +311,7 @@ class AdherentOptions
 	}
       else
 	{
-	  print "Err : ".$this->db->error();
-	  print "<h2><br>$sql<br></h2>";
+   	  print dolibarr_print_error($this->db);
 	  return 0;
 	}
     }else{
@@ -325,12 +320,20 @@ class AdherentOptions
 
   }
 
+
+/*!
+		\brief fonction qui modifie un label
+*/
 	function fetch_optionals()
     {
       $this->fetch_name_optionals();
       $this->fetch_name_optionals_label();
     }
 
+
+/*!
+		\brief fonction qui modifie un label
+*/
 	function fetch_name_optionals()
   {
     $array_name_options=array();
@@ -360,6 +363,9 @@ class AdherentOptions
 
   }
 
+/*!
+		\brief fonction qui modifie un label
+*/
 	function fetch_name_optionals_label()
   {
     $array_name_label=array();
@@ -380,7 +386,7 @@ class AdherentOptions
 	return array();
       }
     }else{
-      print $this->db->error();
+   	  print dolibarr_print_error($this->db);
       return array() ;
     }
 
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 4c431e7a8f4..019e00af5d5 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -31,6 +31,7 @@
 require("./pre.inc.php");
 
 $langs->load("companies");
+$langs->load("bills");
 
 require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
@@ -186,7 +187,8 @@ if ($_POST["action"] == 'add')
         $public=0;
     }
     if (!$error){
-        // email a peu pres correct et le login n'existe pas
+
+    // Email a peu pres correct et le login n'existe pas
     if ($adh->create($user->id) )
     {
         if ($cotisation > 0)
@@ -202,7 +204,7 @@ if ($_POST["action"] == 'add')
                 $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
                 {
@@ -215,13 +217,16 @@ if ($_POST["action"] == 'add')
                     }
                     else
                     {
-                        print "<p> Probleme d'insertion $sql : ".$db->error();
+                        dolibarr_print_error($db);
                     }
                 }
             }
         }
         Header("Location: liste.php?statut=-1");
     }
+    else {
+        dolibarr_print_error($db);
+    }
 }
 }
 
@@ -374,13 +379,13 @@ if ($action == 'create') {
 
     print '<td valign="top" rowspan="13"><textarea name="comment" wrap="soft" cols="40" rows="25"></textarea></td></tr>';
 
-    print '<tr><td>'.$langs->trans("FirstName").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("LastName").'</td><td><input type="text" name="nom" size="40"></td></tr>';
-    print '<tr><td>Societe</td><td><input type="text" name="societe" size="40"></td></tr>';
-    print '<tr><td>Adresse</td><td>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
+    print '<tr><td>'.$langs->trans("Address").'</td><td>';
     print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
-    print '<tr><td>CP Ville</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
-    print '<tr><td>Pays</td><td><input type="text" name="pays" size="40"></td></tr>';
+    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
+    print '<tr><td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("Login").'</td><td><input type="text" name="login" size="40"></td></tr>';
     print '<tr><td>'.$langs->trans("Password").'</td><td><input type="password" name="pass" size="40"></td></tr>';
@@ -393,10 +398,10 @@ if ($action == 'create') {
     print "<tr><td>Date de cotisation</td><td>\n";
     print_date_select();
     print "</td></tr>\n";
-    print "<tr><td>Mode de paiement</td><td>\n";
+    print '<tr><td>Mode de paiment</td><td>';
 
     print '<select name="operation">';
-    print '<option value="CHQ" SELECTED>Chèque';
+    print '<option value="CHQ" selected>Chèque';
     print '<option value="CB">Carte Bleue';
     print '<option value="DEP">Espece';
     print '<option value="TIP">TIP';
@@ -416,7 +421,7 @@ if ($action == 'create') {
     }
     print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>';
     if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
-        print '<tr><td>Libelle</td><td><input name="label" type="text" size=20 value="Cotisation " ></td></tr>';
+        print '<tr><td>'.$langs->trans("Label").'</td><td><input name="label" type="text" size=20 value="Cotisation " ></td></tr>';
     }
     print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
     print "</form>\n";
@@ -512,7 +517,7 @@ if ($rowid > 0)
 
 
     print "<form action=\"fiche.php\" method=\"post\">\n";
-    print '<table class="border" cellspacing="0" width="100%" cellpadding="3">';
+    print '<table class="border" width="100%">';
 
     print '<tr><td>Numero</td><td class="valeur">'.$adh->id.'&nbsp;</td>';
     print '<td valign="top" width="50%">'.$langs->trans("Comments").'</tr>';
@@ -524,16 +529,16 @@ if ($rowid > 0)
 
     print '<tr><td>Personne</td><td class="valeur">'.$adh->getmorphylib().'&nbsp;</td></tr>';
 
-    print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
+    print '<tr><td width="15%">'.$langs->trans("Firstname").'</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
 
-    print '<tr><td>Nom</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("LastName").'</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
 
-    print '<tr><td>Société</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>';
-    print '<tr><td>Adresse</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>';
-    print '<tr><td>CP Ville</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'&nbsp;</td></tr>';
-    print '<tr><td>Pays</td><td class="valeur">'.$adh->pays.'&nbsp;</td></tr>';
-    print '<tr><td>Email</td><td class="valeur">'.$adh->email.'&nbsp;</td></tr>';
-    print '<tr><td>Login</td><td class="valeur">'.$adh->login.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'.$adh->pays.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.$adh->email.'&nbsp;</td></tr>';
+    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur">'.$adh->login.'&nbsp;</td></tr>';
     //  print '<tr><td>Pass</td><td class="valeur">'.$adh->pass.'&nbsp;</td></tr>';
     print '<tr><td>Date de Naissance</td><td class="valeur">'.$adh->naiss.'&nbsp;</td></tr>';
     print '<tr><td>URL Photo</td><td class="valeur">'.$adh->photo.'&nbsp;</td></tr>';
@@ -573,7 +578,7 @@ if ($user->admin)
         print "<a class=\"tabAction\" href=\"fiche.php?rowid=$rowid&action=resign\">Résilier l'adhésion</a>\n";
     }
 
-    print "<a class=\"tabAction\" href=\"fiche.php?rowid=$adh->id&action=delete\">Supprimer</a>\n";
+    print "<a class=\"tabAction\" href=\"fiche.php?rowid=$adh->id&action=delete\">".$langs->trans("Delete")."</a>\n";
 
     /*
     * bouton : "Envoie des informations"
diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php
index 4dec847ef22..309d712d972 100644
--- a/htdocs/adherents/options.php
+++ b/htdocs/adherents/options.php
@@ -74,54 +74,55 @@ if ($_GET["action"] == 'delete' && $user->admin)
 llxHeader();
 
 
-//if ($_GET["action"] != 'create') {
 
-    print_titre("Configuration des champs optionnels");
-    print '<br>';
-    
-    /* ************************************************************************** */
-    /*                                                                            */
-    /*                                                                            */
-    /*                                                                            */
-    /* ************************************************************************** */
-    
-    $array_options=$adho->fetch_name_optionals();
-    $array_label=$adho->fetch_name_optionals_label();
-    if (sizeof($array_options)>0) 
+print_titre("Configuration des champs optionnels");
+print '<br>';
+
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                                            */
+/*                                                                            */
+/* ************************************************************************** */
+
+$array_options=$adho->fetch_name_optionals();
+$array_label=$adho->fetch_name_optionals_label();
+
+print "<table class=\"noborder\">";
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Label").'</td>';
+print "<td>Nom de l'attribut</td>";
+print '<td>'.$langs->trans("Type").'</td><td width="80">&nbsp;</td>';
+print "</tr>\n";
+  
+if (sizeof($array_options)>0) 
+{
+  $var=True;
+  foreach($adho->attribute_name as $key => $value)
     {
-      print "<table class=\"noborder\" cellspacing=\"0\" cellpadding=\"3\">";
-      
-      print '<tr class="liste_titre">';
-      print '<td>'.$langs->trans("Label").'</td>';
-      print "<td>Nom de l'attribut</td>";
-      print '<td>'.$langs->trans("Type").'</td><td width="80">&nbsp;</td>';
-      print "</tr>\n";
-      
-      $var=True;
-      foreach($adho->attribute_name as $key => $value)
-        {
-          $var=!$var;
-          print "<tr $bc[$var]>";
-          print "<td>".$adho->attribute_label[$key]."&nbsp;</td>\n";
-          print "<td>$key</td>\n";
-          print "<td>$value</td>\n";
-          print "<td align=\"center\"><a href=\"options.php?action=edit&attrname=$key\">".img_edit()."</a>";
-          print "&nbsp; <a href=\"options.php?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-          print "</tr>";
-          //      $i++;
-        }
-      print "</table>";
-    
-        /*
-         * Barre d'actions
-         *
-         */
-        print '<div class="tabsAction">';
-        print "<a class=\"tabAction\" href=\"options.php?action=create\">Nouvel attribut</a>";
-        print "</div>";
+      $var=!$var;
+      print "<tr $bc[$var]>";
+      print "<td>".$adho->attribute_label[$key]."&nbsp;</td>\n";
+      print "<td>$key</td>\n";
+      print "<td>$value</td>\n";
+      print "<td align=\"center\"><a href=\"options.php?action=edit&attrname=$key\">".img_edit()."</a>";
+      print "&nbsp; <a href=\"options.php?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+      print "</tr>";
+      //      $i++;
     }
 
-//}
+}
+
+print "</table>";
+
+/*
+ * Barre d'actions
+ *
+ */
+print '<div class="tabsAction">';
+print "<a class=\"tabAction\" href=\"options.php?action=create\">Nouvel attribut</a>";
+print "</div>";
+
 
 /* ************************************************************************** */
 /*                                                                            */
@@ -132,10 +133,9 @@ llxHeader();
 if ($_GET["action"] == 'create') {
 
   print_titre("Nouvel attribut");
-  print '<br>';
   
   print "<form action=\"options.php\" method=\"post\">";
-  print '<table class="border" cellspacing="0" width="100%" cellpadding="3">';
+  print '<table class="border" width="100%">';
   
   print '<input type="hidden" name="action" value="add">';
 
@@ -165,8 +165,7 @@ if ($_GET["action"] == 'create') {
 if ($_GET["attrname"] && $_GET["action"] == 'edit')
 {
 
-  print_titre("Edition du champ $attrname");
-  print '<br>';
+  print_titre("Edition du champ ".$_GET["attrname"]);
   
   /*
    * formulaire d'edition
@@ -174,7 +173,7 @@ if ($_GET["attrname"] && $_GET["action"] == 'edit')
   print '<form method="post" action="options.php?attrname='.$_GET["attrname"].'">';
   print '<input type="hidden" name="attrname" value="'.$_GET["attrname"].'">';
   print '<input type="hidden" name="action" value="update">';
-  print '<table class="border" cellspacing="0" width="100%" cellpadding="3">';
+  print '<table class="border" width="100%">';
 
   print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur"><input type="text" name="label" size="40" value="'.$adho->attribute_label[$_GET["attrname"]].'"></td></tr>';  
   print '<tr><td>Nom de l\'attribut</td><td class="valeur">'.$_GET["attrname"].'&nbsp;</td></tr>';
@@ -186,8 +185,8 @@ if ($_GET["attrname"] && $_GET["action"] == 'edit')
 				   'date'=>'date',
 				   'datetime'=>'date et heure'),$type);
   print '</td></tr>';
-  //  print '<tr><td>Type (non pris en compte)</td><td class="valeur"><input type="text" name="type" size="40" value="'.$adho->attribute_name[$attrname].'"></td></tr>';
-  print '<tr><td>Taille</td><td class="valeur"><input type="text" name="size" size="5" value="'.$size.'"></td></tr>';  
+
+  print '<tr><td>'.$langs->trans("Size").'</td><td class="valeur"><input type="text" name="size" size="5" value="'.$size.'"></td></tr>';  
   print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Save").'"> &nbsp; ';
   print '<input type="submit" name="button" value="'.$langs->trans("Cancel").'"></td></tr>';
   print '</table>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 81ac371fa6a..d3594715ede 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -99,11 +99,11 @@ if ($result)
   $num = $db->num_rows();
   $i = 0;
   
-  print "<table class=\"noborder\" cellspacing=\"0\" cellpadding=\"3\">";
+  print '<table class="noborder" width="100%">';
   
   print '<tr class="liste_titre">';
   print "<td>Id</td>";
-  print '<td>'.$langs->trans("Label").'</td><td>Cotisation ?</td><td>Vote ?</td><td>&nbsp;</td>';
+  print '<td>'.$langs->trans("Label").'</td><td align="center">Cotisation ?</td><td align="center">Vote ?</td><td>&nbsp;</td>';
   print "</tr>\n";
   
   $var=True;
@@ -114,8 +114,8 @@ if ($result)
       print "<tr $bc[$var]>";
       print "<td>".$objp->rowid."</td>\n";
       print '<td>'.$objp->libelle.'</td>';
-      print '<td align="center">'.$objp->cotisation.'</td>';
-      print '<td align="center">'.$objp->vote.'</td>';
+      print '<td align="center">'.$langs->trans($objp->cotisation).'</td>';
+      print '<td align="center">'.$langs->trans($objp->vote).'</td>';
       print '<td><a href="type.php?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</td>';
       print "</tr>";
       $i++;