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

Fix: Bug on utf8

Browse Source
This commit is contained in:
Laurent Destailleur 2009-11-25 12:51:06 +00:00
parent eed7546357
commit 72cf30350a
9 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -445,7 +445,7 @@ class pdf_edison extends ModelePDFCommandes
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Customer name // Customer name
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Customer properties // Customer properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

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

@ -845,7 +845,7 @@ class pdf_einstein extends ModelePDFCommandes
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Customer name // Customer name
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Customer properties // Customer properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

2
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -553,7 +553,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
// On verifie si c'est une societe ou un particulier // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

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

@ -1114,7 +1114,7 @@ class pdf_crabe extends ModelePDFFactures
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
// Recipient name // Recipient name
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Recipient properties // Recipient properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

4
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -901,7 +901,7 @@ class pdf_oursin extends ModelePDFFactures
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
// Customer name // Customer name
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Customer properties // Customer properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

4
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -422,7 +422,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
// Customer name // Customer name
$carac_client = $object->contact->getFullName($outputlangs,1,1); $carac_client = $outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Customer properties // Customer properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

4
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -592,7 +592,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
// Customer name // Customer name
$carac_client = $object->contact->getFullName($outputlangs,1,1); $carac_client = $outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Customer properties // Customer properties
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }

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

@ -915,7 +915,7 @@ class pdf_propale_azur extends ModelePDFPropales
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);
// Nom client // Nom client
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Caracteristiques client // Caracteristiques client
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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 // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
//print $carac_client;exit;
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information

4
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -474,7 +474,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L'); $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L');
// Nom client // Nom client
$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1); $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
// Caracteristiques client // Caracteristiques client
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $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 // On verifie si c'est une societe ou un particulier
if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) 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));
} }
} }