diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 6745928f8133449b3ed621da9935c8c96696d32a..1620f29a8838665cbfbed41801fbdca03e820d90 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -122,7 +122,7 @@ if ($id) 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_SOCIETE) + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER) { // Editeur wysiwyg require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e6b09073768055c83302abb4797069340dfc349a..e063c214ca7b660ebb3fd9ac48991dd5c75998a0 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -692,8 +692,8 @@ DeliveriesOrderAbility=Products deliveries receipt ability ##### FCKeditor ##### ActivateFCKeditor=Activate FCKeditor for: FCKeditorForCompany=WYSIWIG creation/edition of companies description and note -FCKeditorForProductDescription=WYSIWIG creation/edition of products/services description -FCKeditorForProductNote=WYSIWIG creation/edition of products/services note +FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note +FCKeditorForMembers=WYSIWIG creation/edition of members description and note FCKeditorForProductDetails=WYSIWIG creation/edition of details lines for all entities (proposals, orders, invoices, etc...) FCKeditorForMailing=WYSIWIG creation/edition of mailings ##### OSCommerce 1 ##### diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 3643204ceb2fc72cf40fd633e353a35eb99c9c89..eddd73b65082dbe98fc54d3c5fc7e4b0375a3354 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -699,8 +699,8 @@ DeliveriesOrderAbility=Prise en charge des bons de r ##### FCKeditor ##### ActivateFCKeditor=Activer FCKeditor pour : FCKeditorForCompany=Cr�ation/�dition WYSIWIG des descriptions et notes des tiers -FCKeditorForProductDescription=Cr�ation/�dition WYSIWIG des descriptions des produits/services -FCKeditorForProductNote=Cr�ation/�dition WYSIWIG des notes des produits/services +FCKeditorForProduct=Cr�ation/�dition WYSIWIG des descriptions et notes des produits/services +FCKeditorForMembers=Cr�ation/�dition WYSIWIG des descriptions et notes des adh�rents FCKeditorForProductDetails=Cr�ation/�dition WYSIWIG des lignes details des produits (sur commandes, propales, factures, etc...) FCKeditorForMailing=Cr�ation/�dition WYSIWIG des mailings ##### OSCommerce 1 #####