diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index bb8529f61c4..fa28d089c1c 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1159,7 +1159,8 @@ if ($_GET['propalid'] > 0) print ' - '.nl2br($objp->product); print '
'; } - if ($conf->fckeditor->enabled) + // éditeur wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) { require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); $oFCKeditor = new FCKeditor('desc'); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4092bc34afb..f8bc418b3b6 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1352,7 +1352,19 @@ else print ' - '.nl2br($objp->product); print '
'; } - print ''; + // éditeur wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + { + require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); + $oFCKeditor = new FCKeditor('eldesc'); + $oFCKeditor->Value = $objp->description; + $oFCKeditor->Create() ; + } + else + { + print ''; + } + print ''; print ''; if($soc->tva_assuj == "0") print '0'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c8c657a069e..21afb5dceea 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1895,7 +1895,19 @@ else print ' - '.nl2br($objp->product); print '
'; } - print ''; + // éditeur wysiwyg + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + { + require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); + $oFCKeditor = new FCKeditor('desc'); + $oFCKeditor->Value = $objp->description; + $oFCKeditor->Create() ; + } + else + { + print ''; + } + print ''; print ''; if(! $soc->tva_assuj) print '0'; diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 37d50133b6f..dd47005d39f 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -253,8 +253,15 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page - $pdf->SetXY ($this->posxdesc-1, $curY); - $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + { + $pdf->writeHTMLCell(108, 4, $this->posxdesc-1, $curY, $libelleproduitservice, 0, 1); + } + else + { + $pdf->SetXY ($this->posxdesc-1, $curY); + $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + } $nexY = $pdf->GetY(); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 23d2378e5b4..28a3ce29e9f 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -254,8 +254,15 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page - $pdf->SetXY ($this->posxdesc-1, $curY); - $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + { + $pdf->writeHTMLCell(108, 4, $this->posxdesc-1, $curY, $libelleproduitservice, 0, 1); + } + else + { + $pdf->SetXY ($this->posxdesc-1, $curY); + $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + } $nexY = $pdf->GetY(); diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php index 16e33a00f4f..05b69302319 100644 --- a/htdocs/includes/modules/modFckeditor.class.php +++ b/htdocs/includes/modules/modFckeditor.class.php @@ -51,8 +51,8 @@ class modFckeditor extends DolibarrModules $this->name = "FCKeditor"; $this->family = "technic"; - $this->description = "Editeur wysiwyg"; - $this->version = 'development'; // 'experimental' or 'dolibarr' or version + $this->description = "Editeur WYSIWYG"; + $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version $this->const_name = 'MAIN_MODULE_FCKEDITOR'; $this->special = 1; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index f31b372ffa7..3f5d2f240f8 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -254,8 +254,15 @@ class pdf_propale_azur extends ModelePDFPropales $pdf->SetFont('Arial','', 9); // Dans boucle pour gérer multi-page - $pdf->SetXY ($this->posxdesc-1, $curY); - $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + { + $pdf->writeHTMLCell(108, 4, $this->posxdesc-1, $curY, $libelleproduitservice, 0, 1); + } + else + { + $pdf->SetXY ($this->posxdesc-1, $curY); + $pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); + } $nexY = $pdf->GetY(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 2fa137b5bae..573f734d4cf 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -22,6 +22,7 @@ NextValue=Next value ComptaSetup=Accounting module setup UserSetup=Users' management setup Setup=Setup +Activation=Activation SetupShort=Setup OtherOptions=Other options OtherSetup=Other setup @@ -513,7 +514,7 @@ BarcodeEncodeModule=Barcode' encodage type ##### Prelevements ##### WithdrawalsSetup=Withdrawal module setup ##### ExternalRSS ##### -ExternalRSSSetup=External RSS imports setup +ExternalRSSSetup=External RSS imports setup NewRSS=New RSS ##### Mailing ##### MailingSetup=Mailing module setup @@ -525,4 +526,7 @@ SendingsAbility=Support sendings sheets for customer deliveries ##### Deliveries ##### DeliveryOrderNumberingModules=Products deliveries receipt numbering module DeliveryOrderModel=Products deliveries receipt model -DeliveriesOrderAbility=Products deliveries receipt ability \ No newline at end of file +DeliveriesOrderAbility=Products deliveries receipt ability +##### FCKeditor ##### +ActivateFCKeditor=Activate FCKeditor for: +FCKeditorForProductDescription=Creation/edition of products/services description (in all modules) \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index ecbc20b2681..4f3208fa817 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -22,6 +22,7 @@ NextValue=Prochaine valeur ComptaSetup=Configuration du module Comptabilité UserSetup=Configuration gestion des utilisateurs Setup=Configuration +Activation=Activation SetupShort=Config OtherOptions=Autres options OtherSetup=Divers @@ -526,3 +527,6 @@ SendingsAbility=Prise en charge des bons d'exp DeliveryOrderNumberingModules=Module de numérotation des bons de réception client DeliveryOrderModel=Modèle de bon de réception client DeliveriesOrderAbility=Prise en charge des bons de réception client +##### FCKeditor ##### +ActivateFCKeditor=Activer FCKeditor pour : +FCKeditorForProductDescription=Création/édition de la description des produits/services (dans tous les modules) \ No newline at end of file