lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: problem with special characters

Browse Source
This commit is contained in:
Regis Houssin 2009-09-25 10:53:58 +00:00
parent 5fcbb30ea0
commit 5132e76b1a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@ -128,7 +128,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf=new FPDI_Protection('P','mm',$this->format); $pdf=new FPDI_Protection('P','mm',$this->format);
$pdfrights = array('print'); // Ne permet que l'impression du document $pdfrights = array('print'); // Ne permet que l'impression du document
$pdfuserpass = ''; // Mot de passe pour l'utilisateur final $pdfuserpass = ''; // Mot de passe pour l'utilisateur final
$pdfownerpass = NULL; // Mot de passe du propri<EFBFBD>taire, cr<63><72> al<61>atoirement si pas d<>fini $pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini
$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass); $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
} }
else else
@ -285,10 +285,10 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + $j * $height, $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + $j * $height,
dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($fichinterligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration),1,$outputlangs->charset_output), 0, 1, 0); dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($fichinterligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".ConvertSecondToTime($fichinterligne->duration),1,$outputlangs->charset_output), 0, 1, 0);
$tab_height+=4; $tab_height+=4;
$pdf->SetXY (10, $tab_top + 4 + $j * $height); $pdf->SetXY (10, $tab_top + 4 + $j * $height);
$pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + 4 + $j * $height, $desc = dol_htmlentitiesbr($fichinterligne->desc,1);
dol_htmlentitiesbr($outputlangs->convToOutputCharset($fichinterligne->desc),1), 0, 1, 0); $pdf->writeHTMLCell(0, 3, $this->marge_gauche, $tab_top + 4 + $j * $height, $desc, 0, 1, 0);
$tab_height+=dol_nboflines_bis($fichinterligne->desc,52,$outputlangs->charset_output)*4; $tab_height+=dol_nboflines_bis($fichinterligne->desc,52,$outputlangs->charset_output)*4;
$j++; $j++;

2
htdocs/install/upgrade2.php
View File

@ -1851,7 +1851,7 @@ function migrate_commande_livraison($db,$langs,$conf)
} }
/* /*
* Migration des d<EFBFBD>tails commandes dans les d<EFBFBD>tails livraisons * Migration des details commandes dans les details livraisons
*/ */
function migrate_detail_livraison($db,$langs,$conf) function migrate_detail_livraison($db,$langs,$conf)
{ {