diff --git a/htdocs/admin/multicompany.php b/htdocs/admin/multicompany.php
index 4a9d895216d..d16de70451f 100644
--- a/htdocs/admin/multicompany.php
+++ b/htdocs/admin/multicompany.php
@@ -39,9 +39,14 @@ $mc = new Multicompany($db);
  * Actions
  */
 
-if ($_GET["action"] == 'set')
+if ($_GET["action"] == 'setactive')
 {
-	$mc->setEntity($_GET['id'],$_GET["active"]);
+	$mc->setEntity($_GET['id'],'active',$_GET["value"]);
+}
+
+if ($_GET["action"] == 'setvisible')
+{
+	$mc->setEntity($_GET['id'],'visible',$_GET["value"]);
 }
 
 
@@ -69,7 +74,7 @@ if ($_GET["action"] == 'create')
  * Edit
  */
 
-else if ($_GET["action"] == 'edit')
+else if ($_GET["action"] == 'modify')
 {
 	print_titre($langs->trans("EditEntity"));	
 	
diff --git a/htdocs/multicompany/multicompany.class.php b/htdocs/multicompany/multicompany.class.php
index c5b78be49b1..7357461b824 100644
--- a/htdocs/multicompany/multicompany.class.php
+++ b/htdocs/multicompany/multicompany.class.php
@@ -115,12 +115,12 @@ class Multicompany
     /**
 	 *    \brief      Enable/disable entity
 	 */
-	function setEntity($id,$active)
+	function setEntity($id, $type='active', $value)
 	{
 		global $conf;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."entity";
-		$sql.= " SET active = ".$active;
+		$sql.= " SET ".$type." = ".$value;
 		$sql.= " WHERE rowid = ".$id;
 		
 		dol_syslog("Multicompany::setEntity sql=".$sql, LOG_DEBUG);
@@ -206,7 +206,8 @@ class Multicompany
 		$smarty->assign('entities',$this->entities);
 		$smarty->assign('img_on',img_picto($langs->trans("Activated"),'on'));
 		$smarty->assign('img_off',img_picto($langs->trans("Disabled"),'off'));
-
+		$smarty->assign('img_modify',img_edit());
+		$smarty->assign('img_delete',img_delete());
 	}
 
 
diff --git a/htdocs/multicompany/templates/admin-entity.tpl b/htdocs/multicompany/templates/admin-entity.tpl
index e8c0fd78b9c..c44d46cc855 100644
--- a/htdocs/multicompany/templates/admin-entity.tpl
+++ b/htdocs/multicompany/templates/admin-entity.tpl
@@ -23,27 +23,46 @@
  <tr class="liste_titre">
 
    <td>{$langs->trans('Name')}</td>
+   <td align="left">{$langs->trans('Description')}</td>
    <td align="left">{$langs->trans('Town')}</td>
    <td align="left">{$langs->trans('Country')}</td>
    <td align="left">{$langs->trans('Currency')}</td>
+   <td align="center">{$langs->trans('Visible')}</td>
    <td align="center">{$langs->trans('Status')}</td>
+   <td align="center" colspan="2">&nbsp;</td>
 
 {section name=mc loop=$entities}
 {strip}
    <tr class="{cycle values="impair,pair"}">
       <td>{$entities[mc].label}</td>
+      <td align="left">{$entities[mc].description}</td>
       <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_VILLE}</td>
       <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_PAYS}</td>
       <td align="left">{$entities[mc].details.MAIN_MONNAIE}</td>
-      <td align="center">
+      <td align="center" width="30">
       
-      {if $entities[mc].active}
-      <a href="{$smarty.server.SCRIPT_NAME}?action=set&amp;active=0&amp;id={$entities[mc].id}">{$img_on}</a>
+      {if $entities[mc].visible}
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=setvisible&amp;value=0">{$img_on}</a>
       {else}
-      <a href="{$smarty.server.SCRIPT_NAME}?action=set&amp;active=1&amp;id={$entities[mc].id}">{$img_off}</a>
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=setvisible&amp;value=1">{$img_off}</a>
       {/if}
       
       </td>
+      <td align="center" width="30">
+      
+      {if $entities[mc].active}
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=setactive&amp;value=0">{$img_on}</a>
+      {else}
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=setactive&amp;value=1">{$img_off}</a>
+      {/if}
+      
+      </td>
+      <td align="center" width="20">
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=modify">{$img_modify}</a>
+      </td>
+      <td align="center" width="20">
+      	<a href="{$smarty.server.SCRIPT_NAME}?id={$entities[mc].id}&amp;action=delete">{$img_delete}</a>
+      </td>
    </tr>
 {/strip}
 {/section}