diff --git a/htdocs/admin/droitpret.php b/htdocs/admin/droitpret.php
index 9a0b6a50e7f..de0acbd243e 100644
--- a/htdocs/admin/droitpret.php
+++ b/htdocs/admin/droitpret.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+/* Copyright (C) 2007 Patrick Raguin       <patrick.raguin@gmail.com>
+ * Copyright (C) 2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * 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
@@ -117,10 +118,4 @@ print '</form>';
 print '</table>';
 print '<br>';
 
-
-
-
-
-
-
 ?>
diff --git a/htdocs/admin/editeur.php b/htdocs/admin/editeur.php
index 0d70bcb620a..e3be1660622 100644
--- a/htdocs/admin/editeur.php
+++ b/htdocs/admin/editeur.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * 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
@@ -47,7 +48,9 @@ if ($_POST["action"] == 'set')
 // Action desactivation d'un sous module
 if ($_GET["action"] == 'unset')
 {
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+	$sql.= " WHERE ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey);
+	$sql.= " LIKE 'EDITEUR_LIVRE_FORMAT_%'";
 	$sql.= " AND rowid='".$_GET["id"]."';";
 	if ($db->query($sql))
 	{
@@ -89,8 +92,12 @@ print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 $var=true;
 
-
-$sql = "SELECT rowid,value FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'";
+$sql = "SELECT";
+$sql.= " rowid";
+$sql.= ", ".$db->decrypt('value',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as value";
+$sql.= " FROM ".MAIN_DB_PREFIX."const";
+$sql.= " WHERE ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey);
+$sql.= " LIKE 'EDITEUR_LIVRE_FORMAT_%'";
 $result = $db->query($sql);
 
 while ($obj = $db->fetch_object($result) )
@@ -109,4 +116,4 @@ print '</table>';
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/admin/multicompany.php b/htdocs/admin/multicompany.php
index 029bf3d9ef5..20f97e69904 100644
--- a/htdocs/admin/multicompany.php
+++ b/htdocs/admin/multicompany.php
@@ -26,7 +26,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
-//$langs->load("multicompany");
+$langs->load("admin");
 
 if (!$user->admin)
 accessforbidden();
@@ -38,7 +38,7 @@ accessforbidden();
  */
 
 
-llxHeader('',$langs->trans("MultiCompanySetup"),'MultiCompanyConfiguration');
+llxHeader('',$langs->trans("MultiCompanySetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
@@ -49,7 +49,7 @@ print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
  */
 
 print '<br>';
-print_titre($langs->trans("MultiCompanyModule"));
+//print_titre($langs->trans("MultiCompanyModule"));
 
 
 llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 7e62f8fcce3..fb34e722be6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1068,3 +1068,5 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 8dccb65da70..c4a29c156d8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1067,4 +1067,6 @@ WSDLCanBeDownloadedHere=Le descripteur WSDL des services fournis peut etre récu
 EndPointIs=Les clients SOAP doivent envoyer leur requetes vers l'endpoint Dolibarr à l'URL
 ##### Bank #####
 BankSetupModule=Configuration du module Banque
-FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
\ No newline at end of file
+FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
+##### Multicompany #####
+MultiCompanySetup=Configuration du module Multi-société
\ No newline at end of file