diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php
index db65c1754f5..c798cb8093e 100644
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Éric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -111,7 +110,7 @@ print '  <td>'.$langs->trans("Name").'</td>';
 print '  <td>'.$langs->trans("Description").'</td>';
 print '  <td>'.$langs->trans("Example").'</td>';
 print '  <td align="center">'.$langs->trans("Activated").'</td>';
-print '  <td>&nbsp;</td>';
+print '  <td align="center" width="20">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -145,17 +144,20 @@ if ($handle)
 	  
 	  if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
 	    {
-	      print "  <td align=\"center\">\n";
+	      print "<td align=\"center\">\n";
     	  print img_tick();
-	      print "</td>\n  <td>&nbsp;</td>\n";
+	      print "</td>\n";
 	    }
 	  else
 	    {
-
-	      print '<td>&nbsp;</td>';
 	      print '<td align="center"><a href="societe.php?action=setcodeclient&amp;value='.$file.'">'.$langs->trans("Activate").'</a></td>';
 	    }
-	  
+
+		print '<td align="center">';
+  		$s=$modCodeTiers->getToolTip($langs,$soc,-1);
+		print $form->textwithhelp('',$s,1);
+		print '</td>';
+		
 	  print '</tr>';
 	}
     }
@@ -177,7 +179,7 @@ print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
 print '<td align="center">'.$langs->trans("Activated").'</td>';
-print '<td>&nbsp;</td>';
+print '<td align="center" width="20">&nbsp;</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -208,15 +210,14 @@ if ($handle)
 	    {
 	      print '<td align="center">';
     	  print img_tick();
-	      print '</td><td>&nbsp;</td>';
+	      print '</td>';
 	    }
 	  else
 	    {
-	      print '<td>&nbsp;</td>';
 	      print '<td align="center"><a href="societe.php?action=setcodecompta&amp;value='.$file.'">'.$langs->trans("Activate").'</a></td>';
 
 	    }
-	  
+      print '<td>&nbsp;</td>';
 	  print "</tr>\n";
 	}
     }
diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php
index ba6b86e431a..8b5803fcdf1 100644
--- a/htdocs/includes/modules/societe/modules_societe.class.php
+++ b/htdocs/includes/modules/societe/modules_societe.class.php
@@ -128,6 +128,7 @@ class ModeleThirdPartyCode
 		if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
 		if ($type == 0)  $s.=$langs->trans("RequiredIfCustomer").': <b>'.yn(!$this->code_null).'</b><br>';
 		if ($type == 1)  $s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$this->code_null).'</b><br>';
+		if ($type == -1) $s.=$langs->trans("Required").': <b>'.yn(!$this->code_null).'</b><br>';
 		$s.=$langs->trans("CanBeModifiedIfOk").': <b>'.yn($this->code_modifiable).'</b><br>';
 		$s.=$langs->trans("CanBeModifiedIfKo").': <b>'.yn($this->code_modifiable_invalide).'</b><br>';
 		if ($type != -1) $s.=$langs->trans("Example").': <b>'.$this->getExample($langs,$soc,1).'</b>';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 41eb237a8c4..582be224974 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -387,6 +387,8 @@ DetectedVersion=Detected version
 FollowingConstantsWillBeSubstituted=Following constants will be substitute with corresponding value.
 Refresh=Refresh
 BackToList=Back to list
+CanBeModifiedIfOk=Can be modified if valid
+CanBeModifiedIfKo=Can be modified if not valid
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 7f83c2c9585..ae919c7a935 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -388,6 +388,8 @@ DetectedVersion=Version d
 FollowingConstantsWillBeSubstituted=Les constantes suivantes seront substituées par leur valeur correspondante.
 Refresh=Rafraichir
 BackToList=Retour liste
+CanBeModifiedIfOk=Peut être modifié si valide
+CanBeModifiedIfKo=Peut être modifié si invalide
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 0380f7e5885..944e4e55e6c 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -349,10 +349,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 			print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
 		}
 		print '</td><td>';
-		$s=$langs->trans("CustomerCodeDesc").'<br>';
-		$s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeClient->getNom($langs).'</b><br>';
-		$s.=$langs->trans("RequiredIfCustomer").': <b>'.yn(!$modCodeClient->code_null).'</b><br>';
-		$s.=$langs->trans("Example").': <b>'.$modCodeClient->getExample($langs,$soc,1).'</b>';
+		$s=$modCodeClient->getToolTip($langs,$soc,0);
 		print $form->textwithhelp('',$s,1);
 		print '</td></tr></table>';
 
@@ -374,10 +371,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 			print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
 		}
 		print '</td><td>';
-		$s=$langs->trans("SupplierCodeDesc").'<br>';
-		$s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>';
-		$s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>';
-		$s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs,$soc,2).'</b>';
+		$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
 		print $form->textwithhelp('',$s,1);
 		print '</td></tr></table>';
 
@@ -682,10 +676,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
         	print '<input type="hidden" name="code_client" value="'.$soc->code_client.'">';
         }
         print '</td><td>';
-        $s=$langs->trans("CustomerCodeDesc").'<br>';
-        $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeClient->getNom($langs).'</b><br>';
-        $s.=$langs->trans("RequiredIfCustomer").': <b>'.yn(!$modCodeClient->code_null).'</b><br>';
-        $s.=$langs->trans("Example").': <b>'.$modCodeClient->getExample($langs,$soc,1).'</b>';
+		$s=$modCodeClient->getToolTip($langs,$soc,0);
         print $form->textwithhelp('',$s,1);
         print '</td></tr></table>';
 
@@ -709,10 +700,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
         	print '<input type="hidden" name="code_fournisseur" value="'.$soc->code_fournisseur.'">';
         }
         print '</td><td>';
-        $s=$langs->trans("SupplierCodeDesc").'<br>';
-        $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>';
-        $s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>';
-        $s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs,$soc,2).'</b>';
+		$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
         print $form->textwithhelp('',$s,1);
         print '</td></tr></table>';