diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index 56631a5..8d6d1c7 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -113,7 +113,7 @@ class InvoicePdfHandler extends FPDF {
         }
         $clientInfoXAxis = 125;
         
-        $clientAddress = FileExportHelpers::FormatTextForExport($this->factureData['client_real_adress']);
+        $clientAddress = $this->factureData['client_real_adress'];
         $clientAdressWidth = $this->GetStringWidth($clientAddress);
         $maxWidth = $this->GetPageWidth();
         $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
@@ -124,7 +124,7 @@ class InvoicePdfHandler extends FPDF {
         $this->Cell(0, 5, FileExportHelpers::FormatTextForExport($clientName));
         $clientInfoYAxis += 5;
         $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
-        $this->MultiCell( 0, 5, trim($clientAddress));
+        $this->MultiCell( 0, 5, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
         if($clientAdressIsMultiline){
             $clientInfoYAxis += 5;
         }
diff --git a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
index 74597e8..badeb84 100644
--- a/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
+++ b/gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
@@ -202,13 +202,13 @@ class InvoiceRecapService {
                 $pdf->Cell( 0, 7, utf8_decode($clientGroupFacturation["group_facturation_name"]));
                 $clientInfoYAxis += 7;
                 $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis);
-                $clientAdress = FileExportHelpers::FormatTextForExport($clientGroupFacturation["address"]);
+                $clientAdress = $clientGroupFacturation["address"];
                 $clientAdressWidth = $pdf->GetStringWidth($clientAdress);
                 $maxWidth = $pdf->GetPageWidth();
                 $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
                 $clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo;
                 $pdf->SetMargins(0,0,10);
-                $pdf->MultiCell( 0, 7, trim($clientAdress));
+                $pdf->MultiCell( 0, 7, trim(FileExportHelpers::FormatTextForExport($clientAdress)));
                 $pdf->SetMargins(0,0,0);
                 if($clientAdressIsMultiline){
                     $clientInfoYAxis += 7;
@@ -312,7 +312,7 @@ class InvoiceRecapService {
                     $clientInfoYAxis += 7;
                     $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis);
                     $pdf->SetMargins(0,0,10);
-                    $pdf->MultiCell( 0, 7, trim($clientAdress));
+                    $pdf->MultiCell( 0, 7, trim(FileExportHelpers::FormatTextForExport($clientAdress)));
                     $pdf->SetMargins(0,0,0);
                     if($clientAdressIsMultiline){
                         $clientInfoYAxis += 7;
@@ -371,10 +371,10 @@ class InvoiceRecapService {
 
                     for ($index_facture_position; $index_facture_position < ($init_index + $max_nb_toget) ; $index_facture_position++) { 
                         $date_soin_temp = new DateTime($mois[$index_facture_position]['date_soin']);
-                        $defuntNameText = FileExportHelpers::FormatTextForExport($mois[$index_facture_position]['defunt']);
+                        $defuntNameText = $mois[$index_facture_position]['defunt'];
                         $pdf->SetXY( 6, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, $mois[$index_facture_position]['num'], 0, 0, '');
                         $pdf->SetXY( 29, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
-                        $pdf->SetXY( 47, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->MultiCell( 35, 5, $defuntNameText);
+                        $pdf->SetXY( 47, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->MultiCell( 35, 5, FileExportHelpers::FormatTextForExport($defuntNameText),0,'L');
                         $pdf->SetXY( 85, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 38, 5, FileExportHelpers::FormatTextForExport($mois[$index_facture_position]['produit_references']), 0, 0, '');
                         $pdf->SetXY( 147, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 13, 5, number_format($mois[$index_facture_position]['montant_htc'],2,'.','').chr(128), 0, 0, 'C');
                         $pdf->SetXY( 168, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 10, 5, number_format($mois[$index_facture_position]['montant_tva'],2,'.','').chr(128), 0, 0, 'C');
@@ -610,13 +610,12 @@ class InvoiceRecapService {
                     $pdf->Cell( 0, 7, utf8_decode($clientHeaderLabel));
                     $clientInfoYAxis += 7;
                     $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis);
-                    $clientAddress = FileExportHelpers::FormatTextForExport($clientAddress);
                     $clientAdressWidth = $pdf->GetStringWidth($clientAddress);
                     $maxWidth = $pdf->GetPageWidth();
                     $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
                     $clientAdressIsMultiline = $clientAdressWidth > $availableWidhtForClientInfo;
                     $pdf->SetMargins(0,0,10);
-                    $pdf->MultiCell( 0, 7, trim($clientAddress));
+                    $pdf->MultiCell( 0, 7, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
                     $pdf->SetMargins(0,0,0);
                     if($clientAdressIsMultiline){
                         $clientInfoYAxis += 7;
@@ -719,7 +718,7 @@ class InvoiceRecapService {
                         $clientInfoYAxis += 7;
                         $pdf->SetXY($clientInfoXAxis,$clientInfoYAxis);
                         $pdf->SetMargins(0,0,10);
-                        $pdf->MultiCell( 0, 7, trim($clientAddress));
+                        $pdf->MultiCell( 0, 7, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
                         $pdf->SetMargins(0,0,0);
                         if($clientAdressIsMultiline){
                             $clientInfoYAxis += 7;
@@ -780,10 +779,10 @@ class InvoiceRecapService {
 
                         for ($index_facture_position; $index_facture_position < ($init_index + $max_nb_toget) ; $index_facture_position++) { 
                             $date_soin_temp = new DateTime($client[$index_facture_position]['date_soin']);
-                            $defuntNameText = FileExportHelpers::FormatTextForExport($client[$index_facture_position]['defunt']);
+                            $defuntNameText = $client[$index_facture_position]['defunt'];
                             $pdf->SetXY( 6, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, $client[$index_facture_position]['num'], 0, 0, '');
                             $pdf->SetXY( 29, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 18, 5, utf8_decode($formatter_ds->format($date_soin_temp)), 0, 0, '');
-                            $pdf->SetXY( 47, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->MultiCell( 35, 5, $defuntNameText);
+                            $pdf->SetXY( 47, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->MultiCell( 35, 5, FileExportHelpers::FormatTextForExport($defuntNameText));
                             $pdf->SetXY( 85, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 28, 5, utf8_decode(html_entity_decode($client[$index_facture_position]['produit_references'])), 0, 0, '');
                             $pdf->SetXY( 147, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 13, 5, number_format($client[$index_facture_position]['montant_htc'],2,'.','').chr(128), 0, 0, 'C');
                             $pdf->SetXY( 168, $y_facture ); $pdf->SetFont('ComicSans','',8); $pdf->Cell( 10, 5, number_format($client[$index_facture_position]['montant_tva'],2,'.','').chr(128), 0, 0, 'C');