Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Dbut ajout de la configuration du module FCKeditor

Browse Source 
Modification des modles azur (propale), einstein (commande) et crabe (facture) pour afficher la description des produits avec la fonction writeHTMLCell lorsqu'elles ont ts cres avec FCKeditor.
Passage du module FCKEditor en statut "experimental" pour avoir un retour utilisateur
This commit is contained in:
Regis Houssin
2006-07-21 13:43:27 +00:00
parent 6574b49ad9
commit 2304a8cc2d
9 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/propal.php
View File

@@ -1159,7 +1159,8 @@ if ($_GET['propalid'] > 0)
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);
print '<br>'; print '<br>';
} }
if ($conf->fckeditor->enabled) // <20>diteur wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
{ {
require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php");
$oFCKeditor = new FCKeditor('desc'); $oFCKeditor = new FCKeditor('desc');

14
htdocs/commande/fiche.php
View File

@@ -1352,7 +1352,19 @@ else
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);
print '<br>'; print '<br>';
} }
print '<textarea name="eldesc" class="flat" cols="50" rows="1">'.$objp->description.'</textarea></td>'; // <20>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 '<textarea name="eldesc" class="flat" cols="50" rows="1">'.$objp->description.'</textarea>';
}
print '</td>';
print '<td align="right">'; print '<td align="right">';
if($soc->tva_assuj == "0") if($soc->tva_assuj == "0")
print '<input type="hidden" name="tva_tx" value="0">0'; print '<input type="hidden" name="tva_tx" value="0">0';

14
htdocs/compta/facture.php
View File

@@ -1895,7 +1895,19 @@ else
print ' - '.nl2br($objp->product); print ' - '.nl2br($objp->product);
print '<br>'; print '<br>';
} }
print '<textarea name="desc" class="flat" cols="70" rows="'.ROWS_2.'">'.$objp->description.'</textarea></td>'; // <20>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 '<textarea name="desc" class="flat" cols="70" rows="'.ROWS_2.'">'.$objp->description.'</textarea>';
}
print '</td>';
print '<td align="right">'; print '<td align="right">';
if(! $soc->tva_assuj) if(! $soc->tva_assuj)
print '<input type="hidden" name="tva_tx" value="0">0'; print '<input type="hidden" name="tva_tx" value="0">0';

11
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@@ -253,8 +253,15 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page $pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page
$pdf->SetXY ($this->posxdesc-1, $curY); if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
$pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); {
$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(); $nexY = $pdf->GetY();

11
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@@ -254,8 +254,15 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page $pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page
$pdf->SetXY ($this->posxdesc-1, $curY); if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
$pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); {
$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(); $nexY = $pdf->GetY();

4
htdocs/includes/modules/modFckeditor.class.php
View File

@@ -51,8 +51,8 @@ class modFckeditor extends DolibarrModules
$this->name = "FCKeditor"; $this->name = "FCKeditor";
$this->family = "technic"; $this->family = "technic";
$this->description = "Editeur wysiwyg"; $this->description = "Editeur WYSIWYG";
$this->version = 'development'; // 'experimental' or 'dolibarr' or version $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_FCKEDITOR'; $this->const_name = 'MAIN_MODULE_FCKEDITOR';
$this->special = 1; $this->special = 1;

11
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@@ -254,8 +254,15 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page $pdf->SetFont('Arial','', 9); // Dans boucle pour g<>rer multi-page
$pdf->SetXY ($this->posxdesc-1, $curY); if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
$pdf->MultiCell(108, 4, $libelleproduitservice, 0, 'J'); {
$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(); $nexY = $pdf->GetY();

8
htdocs/langs/en_US/admin.lang
View File

@@ -22,6 +22,7 @@ NextValue=Next value
ComptaSetup=Accounting module setup ComptaSetup=Accounting module setup
UserSetup=Users' management setup UserSetup=Users' management setup
Setup=Setup Setup=Setup
Activation=Activation
SetupShort=Setup SetupShort=Setup
OtherOptions=Other options OtherOptions=Other options
OtherSetup=Other setup OtherSetup=Other setup
@@ -513,7 +514,7 @@ BarcodeEncodeModule=Barcode' encodage type
##### Prelevements ##### ##### Prelevements #####
WithdrawalsSetup=Withdrawal module setup WithdrawalsSetup=Withdrawal module setup
##### ExternalRSS ##### ##### ExternalRSS #####
ExternalRSSSetup=External RSS imports setup ExternalRSSSetup=External RSS imports setup<textarea></textarea>
NewRSS=New RSS NewRSS=New RSS
##### Mailing ##### ##### Mailing #####
MailingSetup=Mailing module setup MailingSetup=Mailing module setup
@@ -525,4 +526,7 @@ SendingsAbility=Support sendings sheets for customer deliveries
##### Deliveries ##### ##### Deliveries #####
DeliveryOrderNumberingModules=Products deliveries receipt numbering module DeliveryOrderNumberingModules=Products deliveries receipt numbering module
DeliveryOrderModel=Products deliveries receipt model DeliveryOrderModel=Products deliveries receipt model
DeliveriesOrderAbility=Products deliveries receipt ability DeliveriesOrderAbility=Products deliveries receipt ability
##### FCKeditor #####
ActivateFCKeditor=Activate FCKeditor for:
FCKeditorForProductDescription=Creation/edition of products/services description (in all modules)

4
htdocs/langs/fr_FR/admin.lang
View File

@@ -22,6 +22,7 @@ NextValue=Prochaine valeur
ComptaSetup=Configuration du module Comptabilit<69> ComptaSetup=Configuration du module Comptabilit<69>
UserSetup=Configuration gestion des utilisateurs UserSetup=Configuration gestion des utilisateurs
Setup=Configuration Setup=Configuration
Activation=Activation
SetupShort=Config SetupShort=Config
OtherOptions=Autres options OtherOptions=Autres options
OtherSetup=Divers OtherSetup=Divers
@@ -526,3 +527,6 @@ SendingsAbility=Prise en charge des bons d'exp
DeliveryOrderNumberingModules=Module de num<75>rotation des bons de r<>ception client DeliveryOrderNumberingModules=Module de num<75>rotation des bons de r<>ception client
DeliveryOrderModel=Mod<6F>le de bon de r<>ception client DeliveryOrderModel=Mod<6F>le de bon de r<>ception client
DeliveriesOrderAbility=Prise en charge des bons de r<>ception client DeliveriesOrderAbility=Prise en charge des bons de r<>ception client
##### FCKeditor #####
ActivateFCKeditor=Activer FCKeditor pour :
FCKeditorForProductDescription=Cr<43>ation/<2F>dition de la description des produits/services (dans tous les modules)