From 72cf30350a38648b8a79b8b6951a94f0bb6e2c4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Nov 2009 12:51:06 +0000 Subject: [PATCH] Fix: Bug on utf8 --- htdocs/includes/modules/commande/pdf_edison.modules.php | 4 ++-- htdocs/includes/modules/commande/pdf_einstein.modules.php | 4 ++-- .../modules/expedition/pdf/pdf_expedition_merou.modules.php | 2 +- htdocs/includes/modules/facture/pdf_crabe.modules.php | 4 ++-- htdocs/includes/modules/facture/pdf_oursin.modules.php | 4 ++-- .../includes/modules/livraison/pdf/pdf_sirocco.modules.php | 4 ++-- htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php | 4 ++-- htdocs/includes/modules/propale/pdf_propale_azur.modules.php | 5 +++-- .../includes/modules/propale/pdf_propale_jaune.modules.php | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 177565f9b94..71738439543 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -445,7 +445,7 @@ class pdf_edison extends ModelePDFCommandes $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); // Customer name - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -465,7 +465,7 @@ class pdf_edison extends ModelePDFCommandes // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index de88af29720..fcbcb702912 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -845,7 +845,7 @@ class pdf_einstein extends ModelePDFCommandes $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); // Customer name - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -865,7 +865,7 @@ class pdf_einstein extends ModelePDFCommandes // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 4527e562ef1..940e4f10891 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -553,7 +553,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 36aba94656b..6fb1e093de7 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -1114,7 +1114,7 @@ class pdf_crabe extends ModelePDFFactures $carac_client_name=$outputlangs->convToOutputCharset($socname); // Recipient name - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -1134,7 +1134,7 @@ class pdf_crabe extends ModelePDFFactures // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 7ae2c5c4227..3c6458406eb 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -901,7 +901,7 @@ class pdf_oursin extends ModelePDFFactures $carac_client_name=$outputlangs->convToOutputCharset($socname); // Customer name - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -921,7 +921,7 @@ class pdf_oursin extends ModelePDFFactures // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index eaed98bc190..d4b5683f492 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -422,7 +422,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $carac_client_name=$outputlangs->convToOutputCharset($socname); // Customer name - $carac_client = $object->contact->getFullName($outputlangs,1,1); + $carac_client = $outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -442,7 +442,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 98f09fe6769..80f36f80fe7 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -592,7 +592,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $carac_client_name=$outputlangs->convToOutputCharset($socname); // Customer name - $carac_client = $object->contact->getFullName($outputlangs,1,1); + $carac_client = $outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Customer properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -612,7 +612,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 2546e98d8f2..c0db96f1a26 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -915,7 +915,7 @@ class pdf_propale_azur extends ModelePDFPropales $carac_client_name=$outputlangs->convToOutputCharset($socname); // Nom client - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Caracteristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -935,7 +935,7 @@ class pdf_propale_azur extends ModelePDFPropales // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } } @@ -963,6 +963,7 @@ class pdf_propale_azur extends ModelePDFPropales // Show recipient name $pdf->SetXY($posx+2,$posy+3); $pdf->SetFont('Arial','B',11); +//print $carac_client;exit; $pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); // Show recipient information diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 8d64a42e65d..abd6337ff70 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -474,7 +474,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L'); // Nom client - $carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); // Caracteristiques client $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); @@ -496,7 +496,7 @@ class pdf_propale_jaune extends ModelePDFPropales // On verifie si c'est une societe ou un particulier if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) { - $carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1); + $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); } }