diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 161c258fc773ec9b846d3c6be83190c30f88e161..5024e021ffb35a2ab7f5f4680e991ed47ae8e2bb 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -119,19 +119,11 @@ if ($id)
 	print '<td valign="top" colspan="3">';
 	if ($action == 'edit' && $user->rights->adherent->creer)
 	{
-		print "<input type=\"hidden\" name=\"action\" value=\"update\">";
+	    print "<input type=\"hidden\" name=\"action\" value=\"update\">";
 		print "<input type=\"hidden\" name=\"id\" value=\"".$adh->id."\">";
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER)
-	    {
-		    // Editeur wysiwyg
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('note',$adh->note,280,'dolibarr_notes','In',true);
-			$doleditor->Create();
-	    }
-	    else
-	    {
-			print '<textarea name="note" cols="80" rows="10">'.dol_htmlentitiesbr_decode($adh->note).'</textarea>';
-	    }
+        require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+        $doleditor=new DolEditor('note',$adh->note,280,'dolibarr_notes','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER,10,80);
+        $doleditor->Create();
 	}
 	else
 	{
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f344d4dd0a88442dd0489c81b80b23dc8e2b47fb..bc9d24a7928ce1c2cf07f5bf933e10886bcd639e 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -228,18 +228,9 @@ if ($_GET["action"] == 'create')
 	print "<textarea name=\"comment\" wrap=\"soft\" cols=\"60\" rows=\"3\"></textarea></td></tr>";
 
 	print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
-	if ($conf->fckeditor->enabled)
-	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea class="flat" name="mail_valid" rows="15" cols="90">';
-		print dol_htmlentitiesbr_decode($adht->mail_valid);
-		print '</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
+	$doleditor->Create();
 	print '</td></tr>';
 
 	print "</table>\n";
@@ -616,18 +607,9 @@ if ($rowid > 0)
 		print "<textarea name=\"comment\" wrap=\"soft\" cols=\"90\" rows=\"3\">".$adht->note."</textarea></td></tr>";
 
 		print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
-		if ($conf->fckeditor->enabled)
-		{
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false);
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea class="flat" name="mail_valid" rows="15" cols="90">';
-			print dol_htmlentitiesbr_decode($adht->mail_valid);
-			print '</textarea>';
-		}
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
+		$doleditor->Create();
 		print "</td></tr>";
 
 		print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; &nbsp;';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index a8c9afdd0853625fc3c8ad16ce64e151b05c2e2b..4c8a745e0ed2eb73dda5879ef01a29aace651fd6 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -258,33 +258,18 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')	// Edit
     // Message on login page
 	$var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
-	if ($conf->fckeditor->enabled)
-	{
-		// Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('main_home',$conf->global->MAIN_HOME,158,'dolibarr_notes','In',false);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea name="main_home" cols="90" rows="'.ROWS_5.'">'.dol_htmlentitiesbr_decode($conf->global->MAIN_HOME).'</textarea>';
-	}
+	// Editeur wysiwyg
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('main_home',$conf->global->MAIN_HOME,158,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,ROWS_5,90);
+	$doleditor->Create();
 	print '</td></tr>';
 
 	// Message of the day on home page
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
-	if ($conf->fckeditor->enabled)
-	{
-		// Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,158,'dolibarr_notes','In',false);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea name="main_motd" cols="90" rows="'.ROWS_5.'">'.dol_htmlentitiesbr_decode($conf->global->MAIN_MOTD).'</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,158,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,ROWS_5,90);
+	$doleditor->Create();
 	print '</td></tr>';
 
 	/*
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 7ccc2b701566e237cbb52dbe776567c4e32112e1..d430fdeb1320dd59c3b01c38057e44265da9dbd7 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -134,20 +134,9 @@ print '</tr>';
 print '<tr>';
 print '<td width="25%">'.$langs->trans("Description").'</td>';
 print '<td>';
-
-if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
-{
- 	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-	$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes');
-	$doleditor->Create();
-}
-else
-{
-	print '<textarea name="description" rows="'.ROWS_6.'" cols="50">';
-	print dol_htmlentitiesbr_decode($categorie->description);
-	print '</textarea>';
-}
-
+require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50);
+$doleditor->Create();
 print '</td></tr>';
 print '</table>';
 print '<br>';
diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
index b0fe9088b614b6a8b912d4186b6f4d9ef570c8a3..cdd083b5422379595df57afe9092ba95bd407aa4 100644
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -231,20 +231,9 @@ if ($user->rights->categorie->creer)
 		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input name="nom" size="25" value="'.$categorie->label.'">';
 		print'</td></tr>';
 		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
-
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
-		{
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes');
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea name="description" rows="'.ROWS_6.'" cols="50">';
-			print dol_htmlentitiesbr_decode($categorie->description);
-			print '</textarea>';
-		}
-
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50);
+		$doleditor->Create();
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans ("AddIn").'</td><td>';
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 58bd6018f5fdc1382ebfb0ca62866b5e39e7bb48..18c4f12ac2786a9f2d4ec14bd0a9498b65955444 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -579,17 +579,9 @@ if (GETPOST('action') == 'create')
 
 	// Note
 	print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>';
-	if ($conf->fckeditor->enabled)
-	{
-		// Editeur wysiwyg
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('note',($_POST["note"]?$_POST["note"]:$actioncomm->note),280,'dolibarr_notes','In',true);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea name="note" cols="90" rows="'.ROWS_7.'">'.($_POST["note"]?$_POST["note"]:$actioncomm->note).'</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('note',($_POST["note"]?$_POST["note"]:$actioncomm->note),280,'dolibarr_notes','In',true,$conf->fckeditor->enabled,ROWS_7,90);
+	$doleditor->Create();
 	print '</td></tr>';
 
 	print '</table>';
@@ -762,18 +754,10 @@ if ($_GET["id"])
 
 		// Note
 		print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="3">';
-		if ($conf->fckeditor->enabled)
-		{
-			// Editeur wysiwyg
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('note',$act->note,240,'dolibarr_notes','In',true);
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea name="note" cols="90" rows="'.ROWS_7.'">'.dol_htmlentitiesbr_decode($act->note).'</textarea>';
-		}
-
+		// Editeur wysiwyg
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('note',$act->note,240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90);
+		$doleditor->Create();
 		print '</td></tr>';
 
 		print '</table>';
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index e445352006035a5604a1f36c7e32a6d4f1ebbf54..4aaadcfb9bae19dbf877bc375afbc3c4a1943ccf 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -625,16 +625,9 @@ if ($_GET["action"] == 'create')
 	print '</i></td>';
 	print '<td>';
 	// Editeur wysiwyg
-	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
-	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('body',$_POST['body'],320,'dolibarr_mailings','',true,true);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea cols="70" rows="20" name="body" value="'.$_POST['body'].'"></textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('body',$_POST['body'],320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70);
+	$doleditor->Create();
 	print '</td></tr>';
 	print '</table>';
 
@@ -1014,17 +1007,9 @@ else
 			print '</i></td>';
 			print '<td colspan="3">';
 			// Editeur wysiwyg
-			if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
-			{
-				require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-				$doleditor=new DolEditor('body',$mil->body,320,'dolibarr_mailings','',true,true);
-				$doleditor->Create();
-			}
-			else
-			{
-				print '<textarea class="flat" name="body" cols="70" rows="20">';
-				print dol_htmlentitiesbr_decode($mil->body).'</textarea>';
-			}
+			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+			$doleditor=new DolEditor('body',$mil->body,320,'dolibarr_mailings','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING,20,70);
+			$doleditor->Create();
 			print '</td></tr>';
 
 			print '<tr><td colspan="4" align="center">';
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index 37e146951116124d72cf3ee5464f127692b13c14..17f65bf9571c665745b46c045117c9bac219eba1 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -274,18 +274,9 @@ if ($_REQUEST["action"] == 'create')
 	print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
 	print '<td colspan="3">';
     // Editor wysiwyg
-	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
-	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false);
-		$doleditor->Create();
-	}
-	else
-	{
-		print '<textarea class="flat" name="account_comment" cols="70" rows="10">';
-		print dol_htmlentitiesbr_decode($account->comment);
-		print '</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('account_comment',$account->comment,200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+	$doleditor->Create();
 	print '</td></tr>';
 
 	// Sold
@@ -567,17 +558,9 @@ else
 		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
 		print '<td colspan="3">';
 	   // Editor wysiwyg
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE)
-		{
-			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),200,'dolibarr_notes','',false);
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea class="flat" name="account_comment" cols="70" rows="10">';
-			print dol_htmlentitiesbr_decode(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment).'</textarea>';
-		}
+		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+		$doleditor->Create();
 		print '</td></tr>';
 
         print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit" class="button">';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a6eb0799a1ac666f2cd77a16a961535d8b4c1d3f..c2f91d6a73ecec448d90a9087345f78f2dff8c32 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2922,20 +2922,10 @@ else
 						}
 
 						// Description - Editor wysiwyg
-						if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
-						{
-							require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-							$doleditor=new DolEditor('desc',$objp->description,164,'dolibarr_details');
-							$doleditor->Create();
-						}
-						else
-						{
-							$nbrows=ROWS_2;
-							if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-							print '<textarea name="desc" class="flat" cols="70" rows="'.$nbrows.'">';
-							print dol_htmlentitiesbr_decode($objp->description);
-							print '</textarea>';
-						}
+                        $nbrows=ROWS_2;
+					    require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+						$doleditor=new DolEditor('desc',$objp->description,164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+						$doleditor->Create();
 						print '</td>';
 
 						// VAT
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1d8a389b7f0b11104b65c2f23fadb3e9ad481696..ef3b3612fd5933ebfe25ff03c8c3e0257dfacedb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1324,7 +1324,7 @@ class CommonObject
 	/**
 	 * 	Return HTML with selected object line
 	 * 	@param		line		Selected object line
-	 * 	TODO mettre le html dans un template
+	 * 	TODO Move this into a html class, not a business class
 	 */
 	function printLine($line,$var=true,$num=0,$i=0,$dateSelector=0)
 	{
@@ -1514,20 +1514,12 @@ class CommonObject
 			}
 			if ($_GET["action"] == 'editline')
 			{
-                require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
 			    // editeur wysiwyg
-				if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
-				{
-					require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-					$doleditor=new DolEditor('desc',$line->description,164,'dolibarr_details');
-					$doleditor->Create();
-				}
-				else
-				{
-					$nbrows=ROWS_2;
-					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-					print '<textarea name="desc" cols="70" class="flat" rows="'.$nbrows.'">'.dol_htmlentitiesbr_decode($line->description).'</textarea>';
-				}
+                $nbrows=ROWS_2;
+                if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+        	    require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+		  	    $doleditor=new DolEditor('desc',$line->description,164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+			 	$doleditor->Create();
 			}
 			print '</td>';
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c8e68ed4dc2fba2e7b57cd25db7387d11d4894cb..84f5ab76ad577334e6b5b3023ce9656c081f2f4c 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -485,20 +485,10 @@ class FormMail
 			}
 			else
 			{
-				if ($this->withfckeditor)
-				{
-					// Editeur wysiwyg
-					require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-					$doleditor=new DolEditor('message',$defaultmessage,280,'dolibarr_notes','In',true);
-					$doleditor->Create();
-				}
-				else
-				{
-					print '<textarea cols="72" rows="8" name="message">';
-					print $defaultmessage;
-					print '</textarea>';
-				}
-
+				// Editeur wysiwyg
+				require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+				$doleditor=new DolEditor('message',$defaultmessage,280,'dolibarr_notes','In',true,false,$this->withfckeditor,8,72);
+				$doleditor->Create();
 			}
 			print "</td></tr>\n";
 		}
diff --git a/htdocs/core/tpl/addfreeproductform.tpl.php b/htdocs/core/tpl/addfreeproductform.tpl.php
index 6bf76c1f9328ceadd6a6a1b7b81f804103a9aa73..c4475aa3b351ef32efaf52c17d1cd9a9f6f0361b 100644
--- a/htdocs/core/tpl/addfreeproductform.tpl.php
+++ b/htdocs/core/tpl/addfreeproductform.tpl.php
@@ -47,18 +47,11 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"';
 	if ($conf->product->enabled && $conf->service->enabled) echo '<br>';
 
 	// Editor wysiwyg
-	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
-	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details');
-		$doleditor->Create();
-	}
-	else
-	{
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		echo '<textarea class="flat" cols="70" name="dp_desc" rows="'.$nbrows.'">'.$_POST["dp_desc"].'</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+    $nbrows=ROWS_2;
+    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+	$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+	$doleditor->Create();
 	?>
 	</td>
 
diff --git a/htdocs/core/tpl/addpredefinedproductform.tpl.php b/htdocs/core/tpl/addpredefinedproductform.tpl.php
index fbbe6ad7592902f31fe9f26e81735284f82e5484..c28a87664aaa45292734e2090e7bfd421150ddec 100644
--- a/htdocs/core/tpl/addpredefinedproductform.tpl.php
+++ b/htdocs/core/tpl/addpredefinedproductform.tpl.php
@@ -60,18 +60,11 @@ $colspan = 'colspan="3"';
 	if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
 
 	// Editor wysiwyg
-	if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
-	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-		$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
-		$doleditor->Create();
-	}
-	else
-	{
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		echo '<textarea cols="70" name="np_desc" rows="'.$nbrows.'" class="flat">'.$_POST["np_desc"].'</textarea>';
-	}
+	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+    $nbrows=ROWS_2;
+    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+    $doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+	$doleditor->Create();
 	?>
 	</td>
 	<td align="right"><input type="text" size="2" name="qty" value="1"></td>