diff --git a/htdocs/includes/fpdf/fpdfi/fpdi.php b/htdocs/includes/fpdf/fpdfi/fpdi.php
index 0c6129aace7..9a6b826722a 100644
--- a/htdocs/includes/fpdf/fpdfi/fpdi.php
+++ b/htdocs/includes/fpdf/fpdfi/fpdi.php
@@ -29,7 +29,8 @@ if (defined('DOL_URL_ROOT')) define ("K_PATH_URL_CACHE", DOL_URL_ROOT."/document
 /* End DOLCHANGE Added by Regis */
 
 // DOLCHANGE LDR
-require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdf/fpdf.php');
+if (empty($conf->MAIN_USE_TCPDF)) require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdf/fpdf.php');
+else require_once(DOL_DOCUMENT_ROOT.'/includes/tcpdf/tcpdf.php');
 //require_once(DOL_DOCUMENT_ROOT.'/includes/tcpdf/tcpdf.php');
 
 
diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php
index 38a1724f437..c88906aecfc 100644
--- a/htdocs/includes/modules/action/rapport.pdf.php
+++ b/htdocs/includes/modules/action/rapport.pdf.php
@@ -75,8 +75,8 @@ class CommActionRapport
 		global $user,$conf,$langs;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index e3ff90855c6..3b0a06cde2e 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -88,8 +88,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		global $user,$conf,$langs;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("companies");
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index aaa04fbaffa..e5a2da2c91a 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -96,8 +96,8 @@ class pdf_edison extends ModelePDFCommandes
 		global $user,$conf,$langs,$mysoc;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -194,15 +194,15 @@ class pdf_edison extends ModelePDFCommandes
 				for ($i = 0 ; $i < $nblignes ; $i++)
 				{
 					$curY = $nexY;
-					
+
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
 
 					// Description de la ligne produit
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1);
 					//$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
-					
+
 					$pdf->SetFont('','', 9);   // On repositionne la police par defaut
-					
+
 					$nexY = $pdf->GetY();
 
 					$ref = pdf_getlineref($object, $i, $outputlangs);
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index d3ca51efd63..ace29139181 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -111,8 +111,8 @@ class pdf_einstein extends ModelePDFCommandes
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -242,7 +242,7 @@ class pdf_einstein extends ModelePDFCommandes
 				for ($i = 0 ; $i < $nblignes ; $i++)
 				{
 					$curY = $nexY;
-					
+
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
 
 					// Description of product line
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 e48c56f5b02..574ffdcd154 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -77,8 +77,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		global $user,$conf,$langs,$mysoc;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index d166a00e337..7a7ecddeb52 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -221,8 +221,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 		$object->fetch_thirdparty();
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -335,7 +335,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 					{
 						$pdf->i25($this->marge_gauche+3, ($curY - 2), "000000".$object->lines[$i]->fk_product, 1, 8);
 					}
-					
+
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
 
 					// Description de la ligne produit
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 1a9f8d6e2c0..52447283ce6 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -111,8 +111,8 @@ class pdf_oursin extends ModelePDFFactures
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -215,7 +215,7 @@ class pdf_oursin extends ModelePDFFactures
 
 					// Description of product line
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
-					
+
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,108,3,$this->posxdesc-1,$curY+1);
 
 					//$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 3559ad0b631..892ae38f2a4 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -85,8 +85,8 @@ class pdf_soleil extends ModelePDFFicheinter
 		global $user,$langs,$conf,$mysoc;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 467db289e1f..e76dd23675a 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -84,9 +84,8 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 		global $user,$conf,$langs;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -189,7 +188,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
 
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
-					
+
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,100,3,30,$curY,1);
 
 					//$pdf->writeHTMLCell(100, 3, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index aa81ad8426e..bf70a58d61b 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -105,9 +105,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -246,7 +245,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
 
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
-					
+
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,108,3,$this->posxdesc-1,$curY);
 
 					//$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index 21eea6919f7..3d2af3ccf46 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -375,8 +375,8 @@ class pdf_standard {
 		$this->format = $this->Tformat['paper-size'];
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index da1b3c95b63..8ff3715ebf0 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -354,8 +354,8 @@ class pdf_standardlabel {
         $this->format = $this->Tformat['paper-size'];
 
         if (! is_object($outputlangs)) $outputlangs=$langs;
-        // Force output charset to ISO, because, FPDF expect text encoded in ISO
-        $outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
         $outputlangs->load("main");
         $outputlangs->load("dict");
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index a6ca7a6f764..d1674d99925 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -94,9 +94,8 @@ class pdf_baleine extends ModelePDFProjects
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index c1cdfdd8dbd..03b3e2e23e1 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -110,9 +110,9 @@ class pdf_propale_azur extends ModelePDFPropales
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because FPDF expect text to be encoded in ISO
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='ISO-8859-1';
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -243,7 +243,7 @@ class pdf_propale_azur extends ModelePDFPropales
 				for ($i = 0 ; $i < $nblignes ; $i++)
 				{
 					$curY = $nexY;
-					
+
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
 
 					// Description de la ligne produit
@@ -948,7 +948,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','',8);
 			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":");
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetFillColor(230,230,230);
 			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
@@ -962,7 +962,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			// Show sender information
 			$pdf->SetFont('','',9);
 			$pdf->SetXY($posx+2,$posy+8);
-			$pdf->MultiCell(80, 4, $carac_emetteur);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
 			// If CUSTOMER contact defined, we use it
@@ -998,7 +998,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,0);
 			$pdf->SetFont('','',8);
 			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":");
+			$pdf->MultiCell(80, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L');
 			$pdf->rect($posx, $posy, 100, $hautcadre);
 			$pdf->SetTextColor(0,0,0);
 
@@ -1010,7 +1010,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			// Show recipient information
 			$pdf->SetFont('','',9);
 			$pdf->SetXY($posx+2,$posy+8);
-			$pdf->MultiCell(86,4, $carac_client);
+			$pdf->MultiCell(86,4, $carac_client, 0, 'L');
 		}
 	}
 
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index e817f5bf51b..fa3f251c0b6 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -86,9 +86,9 @@ class pdf_propale_jaune extends ModelePDFPropales
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because FPDF expect text to be encoded in ISO
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='ISO-8859-1';
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -188,7 +188,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 					// Description de la ligne produit
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,1);
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
-					
+
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,102,4,30,$curY,1);
 
 					//$pdf->writeHTMLCell(102, 4, 30, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
@@ -520,7 +520,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 
 		$pdf->SetFont('','',9);
 		$pdf->SetXY($this->marge_gauche+2,$posy+4);
-		$pdf->MultiCell(80, 4, $carac_emetteur);
+		$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
 		$pdf->rect(10, 40, 80, 40);
@@ -540,9 +540,9 @@ class pdf_propale_jaune extends ModelePDFPropales
 		$pdf->rect(110, 90, 90, 10);
 
 		$pdf->SetXY(10,90);
-		$pdf->MultiCell(110, 10, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref));
+		$pdf->MultiCell(110, 10, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), 0, 'L');
 		$pdf->SetXY(110,90);
-		$pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true));
+		$pdf->MultiCell(100, 10, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,'day',false,$outputlangs,true), 0, 'L');
 
 		$posy=15;
 		$pdf->SetFont('','',10);
@@ -609,7 +609,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 		// Show address
 		$pdf->SetFont('','',9);
 		$pdf->SetXY(102,$posy+8);
-		$pdf->MultiCell(86,4, $carac_client);
+		$pdf->MultiCell(86,4, $carac_client, 0, 'L');
 	}
 
 	/**
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index 190ba7f2724..855e9c27cd6 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -81,8 +81,8 @@ class pdf_paiement
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because FPDF expect text to be encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$this->month=$month;
 		$this->year=$year;
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 3933a6a6f95..8ff70b6f06e 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -102,8 +102,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		global $user,$langs,$conf;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// Force output charset to ISO, because, FPDF expect text encoded in ISO
-		$outputlangs->charset_output='ISO-8859-1';
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -236,7 +236,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,0,0,1);
 
 					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
-					
+
 					pdf_getlinedesc($pdf,$object,$i,$outputlangs,108,3,$this->posxdesc-1,$curY,0,0,1);
 
 					//$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index b156638f0b8..8469060325c 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -73,7 +73,7 @@ function pdf_format_address($outputlangs,$object)
  *   	@param      targetcompany	Target company object
  *      @param      targetcontact	Target contact object
  * 		@param		usecontact		Use contact instead of company
- * 		@return		string			Source of file
+ * 		@return		string			String with full address
  */
 function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source')
 {
@@ -468,7 +468,7 @@ function pdf_getlinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hidere
         $desc=$object->lines[$i]->desc; if (empty($desc))   $desc=$object->lines[$i]->description;
         $ref_supplier=$object->lines[$i]->ref_supplier; if (empty($ref_supplier))   $ref_supplier=$object->lines[$i]->ref_fourn;	// TODO Not yeld saved for supplier invoices, only supplier orders
         $note=$object->lines[$i]->note;
-        
+
         if ($issupplierline) $prodser = new ProductFournisseur($db);
         else $prodser = new Product($db);
 
@@ -542,9 +542,9 @@ function pdf_getlinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hidere
                 $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
             }
         }
-        
+
         $libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
-        
+
         if ($object->lines[$i]->date_start || $object->lines[$i]->date_end)
         {
         	// Show duration if exists
@@ -564,10 +564,10 @@ function pdf_getlinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hidere
         	$libelleproduitservice.="<br>".dol_htmlentitiesbr($period,1);
         	//print $libelleproduitservice;
         }
-        
+
         // Description
         $pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
-        
+
         // For compatibility
         return $libelleproduitservice;
     }