diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index da4150bf691..03f7307dec8 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -21,12 +21,7 @@
  */
 require("./pre.inc.php");
 require("../contact.class.php");
-
-if ($sortorder == "") 
-{
-  $sortfield="lower(s.nom)";
-  $sortorder="ASC";
-}
+require (DOL_DOCUMENT_ROOT."/lib/vcard/vcard.class.php");
 
 if ($HTTP_POST_VARS["action"] == 'add') 
 {
@@ -43,6 +38,7 @@ if ($HTTP_POST_VARS["action"] == 'add')
   $contact->phone_pro    = $HTTP_POST_VARS["phone_pro"];
   $contact->phone_perso  = $HTTP_POST_VARS["phone_perso"];
   $contact->phone_mobile = $HTTP_POST_VARS["phone_mobile"];  
+  $contact->jabberid     = $HTTP_POST_VARS["jabberid"];
 
   $_GET["id"] =  $contact->create($user);
 }
@@ -57,7 +53,6 @@ if ($_GET["action"] == 'delete')
   $result = $contact->delete($_GET["id"]);
 
   Header("Location: index.php");
-
 }
 
 
@@ -70,16 +65,24 @@ if ($action == 'update')
 
   $contact->name          = $HTTP_POST_VARS["name"];
   $contact->firstname     = $HTTP_POST_VARS["firstname"];
-  $contact->poste         = $poste;
+  $contact->poste         = $HTTP_POST_VARS["poste"];
 
   $contact->phone_pro     = $HTTP_POST_VARS["phone_pro"];
   $contact->phone_perso   = $HTTP_POST_VARS["phone_perso"];
   $contact->phone_mobile  = $HTTP_POST_VARS["phone_mobile"];
   $contact->fax           = $HTTP_POST_VARS["fax"];
-  $contact->note = $note;
+  $contact->note          = $HTTP_POST_VARS["note"];
   $contact->email         = $HTTP_POST_VARS["email"];
-  
-  $result = $contact->update($HTTP_POST_VARS["contactid"]);
+  $contact->jabberid      = $HTTP_POST_VARS["jabberid"];
+
+  $contact->birthday = mktime(12, 1 , 1, 
+			      $HTTP_POST_VARS["remonth"], 
+			      $HTTP_POST_VARS["reday"], 
+			      $HTTP_POST_VARS["reyear"]);
+
+  $contact->birthday_alert = $HTTP_POST_VARS["birthday_alert"];
+
+  $result = $contact->update($HTTP_POST_VARS["contactid"], $user);
 
 }
 
@@ -110,7 +113,7 @@ if ($_GET["action"] == 'create')
   print '<tr><td>Nom</td><td><input name="name" type="text" size="20" maxlength="80"></td>';
   print '<td>Prenom</td><td><input name="firstname" type="text" size="15" maxlength="80"></td>';
 
-  print '<td>Tel Pro</td><td><input name="phone" type="text" size="18" maxlength="80"></td></tr>';
+  print '<td>Tel Pro</td><td><input name="phone_pro" type="text" size="18" maxlength="80"></td></tr>';
 
 
   print '<tr><td>Poste</td><td colspan="3"><input name="poste" type="text" size="50" maxlength="80"></td>';
@@ -125,6 +128,7 @@ if ($_GET["action"] == 'create')
 
   print '<td>Fax</td><td><input name="fax" type="text" size="18" maxlength="80"></td></tr>';
   print '<tr><td>Email</td><td colspan="3"><input name="email" type="text" size="50" maxlength="80"></td></tr>';
+  print '<tr><td>Note</td><td colspan="5"><textarea name="note"></textarea></td></tr>';
   print '<tr><td align="center" colspan="4"><input type="submit" value="Ajouter"></td></tr>';
   print "</table>";
   print "</form>";
@@ -135,54 +139,83 @@ elseif ($_GET["action"] == 'edit')
   print_fiche_titre ("Edition d'un contact");
 
   $contact = new Contact($db);
-  $contact->fetch($_GET["id"]);
+  $contact->fetch($_GET["id"], $user);
 
   print '<form method="post" action="fiche.php?id='.$_GET["id"].'">';
   print '<input type="hidden" name="action" value="update">';
   print '<input type="hidden" name="contactid" value="'.$contact->id.'">';
   print '<input type="hidden" name="old_name" value="'.$contact->name.'">';
   print '<input type="hidden" name="old_firstname" value="'.$contact->firstname.'">';
-  print '<table class="border" border="0" width="100%">';
+  print '<table class="border" cellpadding="3" celspacing="0" border="0" width="100%">';
   print '<tr><td>Nom</td><td><input name="name" type="text" size="20" maxlength="80" value="'.$contact->name.'"></td>';
   print '<td>Prenom</td><td><input name="firstname" type="text" size="15" maxlength="80" value="'.$contact->firstname.'"></td>';
 
   print '<td>Tel Pro</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.$contact->phone_pro.'"></td></tr>';
 
-  print '<tr><td>Poste</td><td colspan="3"><input name="poste" type="text" size="50" maxlength="80"></td>';
+  print '<tr><td>Poste</td><td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="'.$contact->poste.'"></td>';
 
-  print '<td>Tel Perso</td><td><input name="phone_perso" type="text" size="18" maxlength="80" value="'.$contact->perso.'"></td></tr>';
+  print '<td>Tel Perso</td><td><input name="phone_perso" type="text" size="18" maxlength="80" value="'.$contact->phone_perso.'"></td></tr>';
 
   print '<tr><td>Adresse</td><td colspan="3"><input name="adresse" type="text" size="18" maxlength="80"></td>';
 
-  print '<td>Mobile</td><td><input name="phone_mobile" type="text" size="18" maxlength="80" value="'.$contact->phone_mobile.'"></td></tr>';
+  print '<td>Portable</td><td><input name="phone_mobile" type="text" size="18" maxlength="80" value="'.$contact->phone_mobile.'"></td></tr>';
 
   print '<tr><td>CP Ville</td><td colspan="3"><input name="cp" type="text" size="6" maxlength="80">&nbsp;<input name="cp" type="text" size="20" maxlength="80"></td>';
 
   print '<td>Fax</td><td><input name="fax" type="text" size="18" maxlength="80"></td></tr>';
-  print '<tr><td>Email</td><td colspan="3"><input name="email" type="text" size="50" maxlength="80" value="'.$contact->email.'"></td></tr>';
+  print '<tr><td>Email</td><td colspan="5"><input name="email" type="text" size="50" maxlength="80" value="'.$contact->email.'"></td></tr>';
 
-  print '<tr><td>Jabberid</td><td colspan="3"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
+  print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
 
-  print '<tr><td align="center" colspan="4"><input type="submit" value="Enregistrer"></td></tr>';
+
+  print '<tr><td>Date de naissance</td><td colspan="2">';
+  $html = new Form($db);
+  print $html->select_date();
+  print '</td><td colspan="3">Alerte : ';
+  if ($contact->birthday_alert)
+    {
+      print '<input type="checkbox" name="birthday_alert" checked><td></tr>';
+    }
+  else
+    {
+      print '<input type="checkbox" name="birthday_alert"><td></tr>';
+    }
+
+  print '<tr><td>Note</td><td colspan="5"><textarea name="note"></textarea></td></tr>';
+  print '<tr><td align="center" colspan="6"><input type="submit" value="Enregistrer"></td></tr>';
   print "</table>";
   print "</form>";
 }
 else
 {
   $contact = new Contact($db);
-  $contact->fetch($_GET["id"]);
+  $contact->fetch($_GET["id"], $user);
 
   print_fiche_titre ("Contact : ". $contact->firstname.' '.$contact->name);
 
   print '<table class="noborder" width="100%">';
-  print '<tr><td valign="top">Nom : '.$contact->name.' '.$contact->firstname;
+  print '<tr><td valign="top">Nom : '.$contact->name.' '.$contact->firstname ."<br>";
+
+  if ($contact->poste)
+    print 'Poste : '.$contact->poste ."<br>";
 
   if ($contact->email)
-    print '<br>Email : '.$contact->email;
+    print 'Email : '.$contact->email ."<br>";
+
+  if ($contact->jabberid)
+    print 'Jabber : '.$contact->jabberid ."<br>";
+
+  if ($contact->birthday)
+    print 'Date de naissance : '.strftime("%d %B %Y",$contact->birthday);
+
+  if ($contact->birthday_alert)
+    print ' (alerte)';
+
+  print "<br>";
 
   print '</td><td valign="top">';
 
-  if ($contact->phone_perso)
+  if ($contact->phone_pro)
     print 'Tel Pro : '.$contact->phone_pro ."<br>";
 
   if ($contact->phone_perso)
@@ -194,13 +227,10 @@ else
   if($contact->fax)
     print 'Fax : '.$contact->fax."<br>";
 
-
-    print '</td></tr>';
-
-
-
+  print '</td></tr>';
   print "</table>";
-  
+
+  print nl2br($contact->note);
 
   if ($user->societe_id == 0)
     {
@@ -209,14 +239,14 @@ else
       print '<td align="center" width="20%"><a href="fiche.php?id='.$_GET["id"].'&amp;action=edit">Editer</a></td>';
 
       print '<td align="center" width="20%">-</td>';
-      print '<td align="center" width="20%">-</td>';
+      print '<td align="center" width="20%"><a href="vcard.php?id='.$_GET["id"].'">VCard</a></td>';
+
       print '<td align="center" width="20%">-</td>';
 
-      print '<td align="center" width="20%"><a href="fiche.php?id='.$_GET["id"].'&amp;action=delete">Supprimer</a></td>';
+      print '<td align="center" width="20%"><a href="fiche.php?id='.$_GET["id"].'&amp;action=deleteWARNING">Supprimer</a></td>';
       print "</tr></table>";
     }
   print "<p>\n";
-
 }