From 4e2b3fc68531fd736b633fd4da62f2961fd2a306 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 May 2009 15:06:59 +0000 Subject: [PATCH] Fix: Customer code was not correct if it contains special characters --- ChangeLog | 4 +++- htdocs/includes/modules/facture/pdf_crabe.modules.php | 2 +- htdocs/includes/modules/facture/pdf_oursin.modules.php | 2 +- htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 2 +- htdocs/includes/modules/propale/pdf_propale_jaune.modules.php | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d120fe7d3fd..f73692be748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,9 @@ English Dolibarr changelog For users: - New: Can export commercial proposals - New: Can use a cache for xcal exports. - +- Fix: Customer code was not correct on PDF it if contains special + characters. + For translators: - Update some language files. diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 7aff988d71c..f5afab964ce 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -1007,7 +1007,7 @@ class pdf_crabe extends ModelePDFFactures $posy+=4; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); } if ($showadress) diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index f598be30f53..5e57d3cd8cd 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -1012,7 +1012,7 @@ class pdf_oursin extends ModelePDFFactures $posy+=4; $pdf->SetXY($this->marges['g'],$posy); $pdf->SetFont('Arial','',9); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'L'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'L'); } diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 46ab78c0ca8..75f9dca6774 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -824,7 +824,7 @@ class pdf_propale_azur extends ModelePDFPropales $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); } if ($showadress) diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 6671ca99b18..de5955cea3a 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -434,7 +434,7 @@ class pdf_propale_jaune extends ModelePDFPropales $posy+=5; $pdf->SetXY(100,$posy); $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'R'); + $pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R'); } $posy=39;