diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index ac6d883ebb9..f4e9d26a7d7 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -474,21 +474,10 @@ if ($_GET["action"] == 'create')
 		$html->select_array('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
 		print "</td></tr>";
 
+		// Description (must be a textarea and not html must be allowed (used in list view)
 		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
 		print "<td>";
-
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
-		{
-			// Editeur wysiwyg
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('description','',280,'dolibarr_notes','In',true);
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea name="description" wrap="soft" cols="70" rows="12"></textarea>';
-		}
-
+		print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'"></textarea>';
 		print '</td></tr>';
 
 		print '<tr><td colspan="2" align="center">';
@@ -630,7 +619,7 @@ elseif ($_GET["id"] > 0)
 	// Duration
 	print '<tr><td>'.$langs->trans("TotalDuration").'</td><td>'.ConvertSecondToTime($fichinter->duree).'</td></tr>';
 
-	// Description
+	// Description (must be a textarea and not html must be allowed (used in list view)
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Description');
@@ -642,17 +631,7 @@ elseif ($_GET["id"] > 0)
 	{
 		print '<form name="editdescription" action="'.$_SERVER["PHP_SELF"].'?id='.$fichinter->id.'" method="post">';
 		print '<input type="hidden" name="action" value="setdescription">';
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
-		{
-			// Editeur wysiwyg
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('description',$fichinter->description,280,'dolibarr_notes','In',true);
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea name="description" wrap="soft" cols="70" rows="12">'.dol_htmlentitiesbr_decode($fichinter->description).'</textarea>';
-		}
+		print '<textarea name="description" wrap="soft" cols="70" rows="'.ROWS_3.'">'.dol_htmlentitiesbr_decode($fichinter->description).'</textarea><br>';
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	}
@@ -666,13 +645,12 @@ elseif ($_GET["id"] > 0)
 	// Statut
 	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$fichinter->getLibStatut(4).'</td></tr>';
 
-	print "</table><br>";
+	print "</table>";
 
 	/*
 	 * Lignes d'intervention
 	 */
-	print '<table class="noborder" width="100%">';
-
+	
 	$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang';
 	$sql.= ', '.$db->pdate('ft.date').' as date_intervention';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
@@ -686,6 +664,8 @@ elseif ($_GET["id"] > 0)
 
 		if ($num)
 		{
+			print '<br><table class="noborder" width="100%">';
+			
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans('Description').'</td>';
 			print '<td align="center">'.$langs->trans('Date').'</td>';
@@ -816,69 +796,73 @@ elseif ($_GET["id"] > 0)
 		}
 
 		$db->free($resql);
+		
+		/*
+		 * Ajouter une ligne
+		 */
+		if ($fichinter->statut == 0 && $user->rights->ficheinter->creer && $_GET["action"] <> 'editline')
+		{
+			if (! $num) print '<br><table class="noborder" width="100%">';
+			
+			print '<tr class="liste_titre">';
+			print '<td>';
+			print '<a name="add"></a>'; // ancre
+			print $langs->trans('Description').'</td>';
+			print '<td align="center">'.$langs->trans('Date').'</td>';
+			print '<td align="right">'.$langs->trans('Duration').'</td>';
+	
+			print '<td colspan="4">&nbsp;</td>';
+			print "</tr>\n";
+	
+			// Ajout ligne d'intervention
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$fichinter->id.'#add" name="addinter" method="post">';
+			print '<input type="hidden" name="fichinterid" value="'.$fichinter->id.'">';
+			print '<input type="hidden" name="action" value="addligne">';
+	
+			$var=false;
+	
+			print '<tr '.$bc[$var].">\n";
+			print '<td>';
+			// �diteur wysiwyg
+			if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
+			{
+				require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+				$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
+				$doleditor->Create();
+			}
+			else
+			{
+				print '<textarea class="flat" cols="70" name="np_desc" rows="'.ROWS_2.'"></textarea>';
+			}
+			print '</td>';
+	
+			// Date intervention
+			print '<td align="center" nowrap="nowrap">';
+			$timearray=dolibarr_getdate(mktime());
+			$timewithnohour=dolibarr_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+			$html->select_date($timewithnohour,'di',1,1,0,"addinter");
+			print '</td>';
+	
+			// Duration
+			print '<td align="right">';
+			$html->select_duree('duration');
+			print '</td>';
+	
+			print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addligne"></td>';
+			print '</tr>';
+	
+			print '</form>';
+			
+			if (! $num) print '</table>';
+		}		
+		
+		if ($num) print '</table>';
 	}
 	else
 	{
 		dolibarr_print_error($db);
 	}
 
-	/*
-	 * Ajouter une ligne
-	 */
-	if ($fichinter->statut == 0 && $user->rights->ficheinter->creer && $_GET["action"] <> 'editline')
-	{
-		print '<tr class="liste_titre">';
-		print '<td>';
-		print '<a name="add"></a>'; // ancre
-		print $langs->trans('Description').'</td>';
-		print '<td align="center">'.$langs->trans('Date').'</td>';
-		print '<td align="right">'.$langs->trans('Duration').'</td>';
-
-		print '<td colspan="4">&nbsp;</td>';
-		print "</tr>\n";
-
-		// Ajout ligne d'intervention
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$fichinter->id.'#add" name="addinter" method="post">';
-		print '<input type="hidden" name="fichinterid" value="'.$fichinter->id.'">';
-		print '<input type="hidden" name="action" value="addligne">';
-
-		$var=true;
-
-		print '<tr '.$bc[$var].">\n";
-		print '<td>';
-		// �diteur wysiwyg
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
-		{
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea class="flat" cols="70" name="np_desc" rows="'.ROWS_2.'"></textarea>';
-		}
-		print '</td>';
-
-		// Date d'intervention
-		print '<td align="center" nowrap="nowrap">';
-		$timearray=dolibarr_getdate(mktime());
-		$timewithnohour=dolibarr_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
-		$html->select_date($timewithnohour,'di',1,1,0,"addinter");
-		print '</td>';
-
-		// Dur�e
-		print '<td align="right">';
-		$html->select_duree('duration');
-		print '</td>';
-
-		print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addligne"></td>';
-		print '</tr>';
-
-		print '</form>';
-	}
-
-	print '</table>';
-
 	print '</div>';
 	print "\n";
 
@@ -891,52 +875,55 @@ elseif ($_GET["id"] > 0)
 
 	if ($user->societe_id == 0)
 	{
-		// Validate
-		if ($fichinter->statut == 0 && $user->rights->ficheinter->creer)
+		if ($_GET['action'] != 'editdescription')
 		{
-			print '<a class="butAction" ';
-			if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+			// Validate
+			if ($fichinter->statut == 0 && $user->rights->ficheinter->creer)
 			{
-				$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_validate&confirm=yes';
-				print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmValidateIntervention')).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"';
+				print '<a class="butAction" ';
+				if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+				{
+					$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_validate&confirm=yes';
+					print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmValidateIntervention')).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"';
+				}
+				else
+				{
+					print 'href="fiche.php?id='.$_GET["id"].'&action=validate"';
+				}
+				print '>'.$langs->trans("Valid").'</a>';
 			}
-			else
+	
+			// Modify
+			if ($fichinter->statut == 1 && $user->rights->ficheinter->creer)
 			{
-				print 'href="fiche.php?id='.$_GET["id"].'&action=validate"';
+				print '<a class="butAction" ';
+				if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+				{
+					$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_modify&confirm=yes';
+					print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmModifyIntervention')).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"';
+				}
+				else
+				{
+					print 'href="fiche.php?id='.$_GET["id"].'&action=modify"';
+				}
+				print '>'.$langs->trans("Modify").'</a>';
 			}
-			print '>'.$langs->trans("Valid").'</a>';
-		}
-
-		// Modify
-		if ($fichinter->statut == 1 && $user->rights->ficheinter->creer)
-		{
-			print '<a class="butAction" ';
-			if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+	
+			// Delete
+			if (($fichinter->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
 			{
-				$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_modify&confirm=yes';
-				print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans('ConfirmModifyIntervention')).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"';
+				print '<a class="butActionDelete" ';
+				if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
+				{
+					$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_delete&confirm=yes';
+					print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans("ConfirmDeleteIntervention",$fichinter->ref)).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'delete\')"';
+				}
+				else
+				{
+					print 'href="'.$_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&amp;action=delete"';
+				}
+				print '>'.$langs->trans('Delete').'</a>';
 			}
-			else
-			{
-				print 'href="fiche.php?id='.$_GET["id"].'&action=modify"';
-			}
-			print '>'.$langs->trans("Modify").'</a>';
-		}
-
-		// Delete
-		if (($fichinter->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
-		{
-			print '<a class="butActionDelete" ';
-			if ($conf->use_javascript_ajax && $conf->global->MAIN_CONFIRM_AJAX)
-			{
-				$url = $_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&action=confirm_delete&confirm=yes';
-				print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.dol_escape_js($langs->trans("ConfirmDeleteIntervention",$fichinter->ref)).'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'delete\')"';
-			}
-			else
-			{
-				print 'href="'.$_SERVER["PHP_SELF"].'?id='.$fichinter->id.'&amp;action=delete"';
-			}
-			print '>'.$langs->trans('Delete').'</a>';
 		}
 	}
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index c0b7333eea7..89f70a97f9a 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -61,8 +61,8 @@ llxHeader();
 
 
 $sql = "SELECT";
-$sql.= " f.ref, f.rowid as fichid, f.fk_statut,";
-$sql.= " fd.description, ".$db->pdate("fd.date")." as dp, fd.duree,";
+$sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,";
+$sql.= " fd.description as descriptiondetail, ".$db->pdate("fd.date")." as dp, fd.duree,";
 $sql.= " s.nom,s.rowid as socid";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
 $sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
@@ -93,7 +93,8 @@ if ($result)
     print "<tr class=\"liste_titre\">";
     print_liste_field_titre($langs->trans("Ref"),"index.php","f.ref","",$urlparam,'width="15%"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","",$urlparam,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Description"),"index.php","fd.description","",$urlparam,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Description"),"index.php","f.description","",$urlparam,'',$sortfield,$sortorder);
+    print '<td>&nbsp;</td>';
     print_liste_field_titre($langs->trans("Date"),"index.php","fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Duration"),"index.php","fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Status"),"index.php","f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
@@ -107,7 +108,8 @@ if ($result)
         print "<tr $bc[$var]>";
         print "<td><a href=\"fiche.php?id=".$objp->fichid."\">".img_object($langs->trans("Show"),"task").' '.$objp->ref."</a></td>\n";
         print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44)."</a></td>\n";
-        print '<td>'.nl2br($objp->description).'</td>';
+        print '<td>'.dol_htmlentitiesbr(dolibarr_trunc($objp->description,20)).'</td>';
+        print '<td>'.dol_htmlentitiesbr(dolibarr_trunc($objp->descriptiondetail,20)).'</td>';
         print '<td align="center">'.dolibarr_print_date($objp->dp,'dayhour')."</td>\n";
         print '<td align="right">'.ConvertSecondToTime($objp->duree).'</td>';
         print '<td align="right">'.$fichinter_static->LibStatut($objp->fk_statut,5).'</td>';