diff --git a/ChangeLog b/ChangeLog
index 3ad00d6bc31..3972aca610a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ For users:
 For translators:
 - New: Update and complete slovenian language sl_SL.
 - New: Add full manually translated files for de_AT en de_DE (thanks to eCleaner.at).
+- New: Create the language ja_JP.
 
 For developers:
 - New: Add jquery by default.
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 89478ee8f32..aacffb03c6d 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -115,6 +115,8 @@ class pdf_oursin extends ModelePDFFactures
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (!class_exists('TCPDF')) $outputlangs->charset_output='ISO-8859-1';
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
 		$outputlangs->load("companies");
@@ -195,7 +197,7 @@ class pdf_oursin extends ModelePDFFactures
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', 9);
+				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
 
@@ -203,7 +205,7 @@ class pdf_oursin extends ModelePDFFactures
 				$tab_height = 110;
 
 				$pdf->SetFillColor(220,220,220);
-				$pdf->SetFont('','', 9);
+				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->SetXY ($this->marges['g'], $tab_top + $this->marges['g'] );
 
 				$iniY = $pdf->GetY();
@@ -266,7 +268,7 @@ class pdf_oursin extends ModelePDFFactures
 						$pdf->AddPage();
 						$pagenb++;
 						$this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->SetFont('','', 9);
+						$pdf->SetFont('','', $default_font_size - 1);
 						$pdf->MultiCell(0, 3, '');		// Set interline to 3
 						$pdf->SetTextColor(0,0,0);
 					}
@@ -330,13 +332,15 @@ class pdf_oursin extends ModelePDFFactures
 		$tab3_width = 80;
 		$tab3_height = 4;
 
-		$pdf->SetFont('','',8);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('','', $default_font_size - 2);
 		$pdf->SetXY ($tab3_posx, $tab3_top - 5);
 		$pdf->MultiCell(60, 5, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
 
 		$pdf->Rect($tab3_posx, $tab3_top-1, $tab3_width, $tab3_height);
 
-        $pdf->SetFont('','',6);
+		$pdf->SetFont('','', $default_font_size - 4);
 		$pdf->SetXY ($tab3_posx, $tab3_top-1 );
 		$pdf->MultiCell(20, 4, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
 		$pdf->SetXY ($tab3_posx+21, $tab3_top-1 );
@@ -348,7 +352,7 @@ class pdf_oursin extends ModelePDFFactures
 
 		$y=0;
 
-		$pdf->SetFont('','',6);
+		$pdf->SetFont('','', $default_font_size - 4);
 
 		// Loop on each credit note included
 		$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
@@ -446,12 +450,14 @@ class pdf_oursin extends ModelePDFFactures
 	{
 		global $conf;
 
-		$pdf->SetFont('','', 9);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('','', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
 		{
-			$pdf->SetFont('','B',8);
+			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
 
@@ -461,12 +467,12 @@ class pdf_oursin extends ModelePDFFactures
 		// Show payments conditions
 		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
 		{
-			$pdf->SetFont('','B',8);
+			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 
-			$pdf->SetFont('','',8);
+			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY(52, $posy);
 			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
 			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
@@ -485,7 +491,7 @@ class pdf_oursin extends ModelePDFFactures
 			{
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
 				$pdf->SetTextColor(0,0,0);
 
@@ -497,12 +503,12 @@ class pdf_oursin extends ModelePDFFactures
 			&& $object->mode_reglement_code != 'CHQ'
 			&& $object->mode_reglement_code != 'VIR')
 			{
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
-				$pdf->SetFont('','',8);
+				$pdf->SetFont('','', $default_font_size - 2);
 				$pdf->SetXY(50, $posy);
 				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
 				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
@@ -522,24 +528,24 @@ class pdf_oursin extends ModelePDFFactures
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B',8);
+						$pdf->SetFont('','B', $default_font_size - 2);
 						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio).':',0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','',8);
+						$pdf->SetFont('','', $default_font_size - 2);
 						$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
 						$posy=$pdf->GetY()+2;
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B',8);
+						$pdf->SetFont('','B', $default_font_size - 2);
 						$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByChequeOrderedToShort').' '.$outputlangs->convToOutputCharset($this->emetteur->nom).' '.$outputlangs->transnoentities('SendTo').':',0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','',8);
+						$pdf->SetFont('','', $default_font_size - 2);
 						$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 						$posy=$pdf->GetY()+2;
 					}
@@ -584,9 +590,11 @@ class pdf_oursin extends ModelePDFFactures
 		$langs->load("main");
 		$langs->load("bills");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		$tab2_top = $this->marges['h']+202;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', 9);
+		$pdf->SetFont('','', $default_font_size - 1);
 
 		// Tableau total
 		$col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164;
@@ -647,7 +655,7 @@ class pdf_oursin extends ModelePDFFactures
 			$index++;
 			$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->SetTextColor(22,137,210);
-			$pdf->SetFont('','B', 10);
+			$pdf->SetFont('','B', $default_font_size + 1);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), 0, 'L', 0);
 			$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), 0, 'R', 0);
@@ -661,7 +669,7 @@ class pdf_oursin extends ModelePDFFactures
 
 		if ($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0)
 		{
-			$pdf->SetFont('','', 10);
+			$pdf->SetFont('','', $default_font_size);
 
 			// Already paid + Deposits
 			$index++;
@@ -703,7 +711,7 @@ class pdf_oursin extends ModelePDFFactures
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), 0, 'R', 0);
 
 			// Fin
-			$pdf->SetFont('','B', 11);
+			$pdf->SetFont('','B', $default_font_size + 1);
 			$pdf->SetTextColor(0,0,0);
 		}
 
@@ -721,10 +729,12 @@ class pdf_oursin extends ModelePDFFactures
 		$langs->load("main");
 		$langs->load("bills");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		$pdf->line( $this->marges['g'], $tab_top+8, 210-$this->marges['d'], $tab_top+8 );
 		$pdf->line( $this->marges['g'], $tab_top + $tab_height, 210-$this->marges['d'], $tab_top + $tab_height );
 
-		$pdf->SetFont('','B',10);
+		$pdf->SetFont('','B', $default_font_size);
 
 		$pdf->SetXY($this->marges['g'],$tab_top + 1);
         $pdf->MultiCell(0, 4, $outputlangs->transnoentities("Designation"), 0, 'L');
@@ -775,6 +785,7 @@ class pdf_oursin extends ModelePDFFactures
 		$langs->load("companies");
 
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
@@ -783,7 +794,7 @@ class pdf_oursin extends ModelePDFFactures
 		}
 
 		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B',$default_font_size + 3);
 
 		$pdf->SetXY($this->marges['g'],6);
 
@@ -800,7 +811,7 @@ class pdf_oursin extends ModelePDFFactures
 			else
 			{
 				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
@@ -817,7 +828,7 @@ class pdf_oursin extends ModelePDFFactures
 		 */
 		$posy=$this->marges['h']+24;
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('','', $default_font_size - 2);
 		$pdf->SetXY($this->marges['g'],$posy-5);
 
 
@@ -830,13 +841,13 @@ class pdf_oursin extends ModelePDFFactures
 
 		// Sender name
 		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B',10);
+		$pdf->SetFont('','B', $default_font_size);
 		$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
 
 		// Sender properties
 		$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
 
-		$pdf->SetFont('','',9);
+		$pdf->SetFont('','', $default_font_size - 1);
 		$pdf->SetXY($this->marge_gauche,$posy+9);
 		$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
@@ -844,9 +855,9 @@ class pdf_oursin extends ModelePDFFactures
 		// Client destinataire
 		$posy=45;
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('','', $default_font_size - 2);
 		$pdf->SetXY($this->marges['g']+100,$posy-5);
-		$pdf->SetFont('','B',10);
+		$pdf->SetFont('','B',$default_font_size);
 
 		// If BILLING contact defined on invoice, we use it
 		$usecontact=false;
@@ -873,11 +884,11 @@ class pdf_oursin extends ModelePDFFactures
 		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
 
 		// Show customer/recipient
-		$pdf->SetFont('','B',10);
+		$pdf->SetFont('','B', $default_font_size);
 		$pdf->SetXY($this->marges['g']+100,$posy+4);
 		$pdf->MultiCell(86,4, $carac_client_name, 0, 'L');
 
-		$pdf->SetFont('','B',9);
+		$pdf->SetFont('','B', $default_font_size - 1);
 		$pdf->SetXY($this->marges['g']+100,$posy+8);
 		$pdf->MultiCell(86,4, $carac_client, 0, 'L');
 
@@ -885,7 +896,7 @@ class pdf_oursin extends ModelePDFFactures
 		 * ref facture
 		 */
 		$posy=70;
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($this->marges['g'],$posy-5);
 		$pdf->SetTextColor(0,0,0);
 		$title=$outputlangs->transnoentities("Invoice");
@@ -894,7 +905,7 @@ class pdf_oursin extends ModelePDFFactures
 		if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
 		if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProForma");
 		$pdf->MultiCell(100, 10, $title.' '.$outputlangs->transnoentities("Of").' '.dol_print_date($object->date,"day",false,$outputlangs,true), '' , 'L');
-		$pdf->SetFont('','B',11);
+		$pdf->SetFont('','B', $default_font_size + 1);
 		$pdf->SetXY($this->marges['g'],$posy);
 		$pdf->SetTextColor(22,137,210);
 		$pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $outputlangs->transnoentities($object->ref), '', 'L');
@@ -937,7 +948,7 @@ class pdf_oursin extends ModelePDFFactures
 		{
 			$posy+=5;
 			$pdf->SetXY($this->marges['g'],$posy);
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'L');
 		}
 
@@ -945,7 +956,7 @@ class pdf_oursin extends ModelePDFFactures
 		{
 			$posy+=4;
 			$pdf->SetXY($this->marges['g'],$posy);
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'L');
 		}
 
@@ -970,7 +981,7 @@ class pdf_oursin extends ModelePDFFactures
 						{
 							$posy+=4;
 							$pdf->SetXY($this->marges['g'],$posy);
-							$pdf->SetFont('','',9);
+							$pdf->SetFont('','', $default_font_size - 1);
 							$pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefProposal")." : ".$outputlangs->transnoentities($newobject->ref));
 						}
 					}
@@ -996,7 +1007,7 @@ class pdf_oursin extends ModelePDFFactures
 						{
 							$posy+=4;
 							$pdf->SetXY($this->marges['g'],$posy);
-							$pdf->SetFont('','',9);
+							$pdf->SetFont('','', $default_font_size - 1);
 							$text=$newobject->ref;
 							if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
 							$pdf->MultiCell(60, 3, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text));
@@ -1008,7 +1019,7 @@ class pdf_oursin extends ModelePDFFactures
 
 		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',10);
+		$pdf->SetFont('','', $default_font_size);
 		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
         $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), 91);
         $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index 2d8ee11c781..7336002cdf6 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -107,6 +107,8 @@ class pdf_baleine extends ModelePDFProjects
 		{
 			$nblignes = sizeof($object->lines);
 
+			$default_font_size = pdf_getPDFFontsize($outputlangs);
+
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
 			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
@@ -171,7 +173,7 @@ class pdf_baleine extends ModelePDFProjects
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', 9);
+				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
 
@@ -183,7 +185,7 @@ class pdf_baleine extends ModelePDFProjects
 				// Affiche notes
 				if (! empty($object->note_public))
 				{
-					$pdf->SetFont('','', 9);
+					$pdf->SetFont('','', $default_font_size - 1);
 					$pdf->SetXY ($this->posxref-1, $tab_top-2);
 					$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
 					$nexY = $pdf->GetY();
@@ -218,7 +220,7 @@ class pdf_baleine extends ModelePDFProjects
 					$dateend=dol_print_date($object->lines[$i]->date_end,'day');
 
 
-					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
+					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 
 					$pdf->SetXY($this->posxref, $curY);
 					$pdf->MultiCell(60, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
@@ -232,7 +234,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->MultiCell(20, 3, $dateend, 0, 'L');
 
 
-					$pdf->SetFont('','', 9);   // On repositionne la police par defaut
+					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 					$nexY = $pdf->GetY();
 
 					$nexY+=2;    // Passe espace entre les lignes
@@ -316,8 +318,10 @@ class pdf_baleine extends ModelePDFProjects
 		// line prend une position y en 3eme param
 		$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',10);
+		$pdf->SetFont('','', $default_font_size);
 
 		$pdf->SetXY ($this->posxref-1, $tab_top+2);
 		$pdf->MultiCell(80,2, $outputlangs->transnoentities("Tasks"),'','L');
@@ -334,10 +338,12 @@ class pdf_baleine extends ModelePDFProjects
 	{
 		global $langs,$conf,$mysoc;
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 
 		$posy=$this->marge_haute;
 
@@ -354,18 +360,18 @@ class pdf_baleine extends ModelePDFProjects
 			else
 			{
 				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->nom), 0, 'L');
 
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Project")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
-		$pdf->SetFont('','',12);
+		$pdf->SetFont('','', $default_font_size + 2);
 
 		$posy+=6;
 		$pdf->SetXY(100,$posy);
@@ -396,7 +402,7 @@ class pdf_baleine extends ModelePDFProjects
 						{
 							$posy+=4;
 							$pdf->SetXY(100,$posy);
-							$pdf->SetFont('','',9);
+							$pdf->SetFont('','', $default_font_size - 1);
 							$text=$newobject->ref;
 							if ($newobject->ref_client) $text.=' ('.$newobject->ref_client.')';
 							$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index de3721cb753..97997f6e42b 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -112,6 +112,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		if ($conf->fournisseur->dir_output.'/facture')
 		{
 			$deja_regle = $object->getSommePaiement();
@@ -184,7 +186,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', 9);
+				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
 
@@ -198,7 +200,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$tab_top = 88;
 
-					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
+					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 					$pdf->SetXY ($this->posxdesc-1, $tab_top);
 					$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
 					$nexY = $pdf->GetY();
@@ -225,14 +227,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$curY = $nexY;
 
-                    $pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
+                    $pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 
                     // Description de la ligne produit
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,0,0,1);
 					pdf_writelinedesc($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);
 
-					$pdf->SetFont('','', 9);   // On repositionne la police par defaut
+					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 					$nexY = $pdf->GetY();
 
 					// TVA
@@ -296,7 +298,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$pdf->AddPage();
 						$pagenb++;
 						$this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->SetFont('','', 9);
+						$pdf->SetFont('','', $default_font_size - 1);
 						$pdf->MultiCell(0, 3, '');		// Set interline to 3
 						$pdf->SetTextColor(0,0,0);
 
@@ -332,7 +334,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$pdf->SetXY ($this->marge_gauche, 228);
 					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',8);
+					$pdf->SetFont('','B', $default_font_size - 2);
 					$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
 					$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorCreateBankAccount"),0,'L',0);
 					$pdf->SetTextColor(0,0,0);
@@ -378,7 +380,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	{
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', 9);
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+		$pdf->SetFont('','', $default_font_size - 1);
 
 		$pdf->SetXY ($this->marge_gauche, $tab2_top + 0);
 
@@ -468,7 +472,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
-		$pdf->SetFont('','', 9);
+		$pdf->SetFont('','', $default_font_size - 1);
 		$pdf->SetTextColor(0,0,0);
 
 		if ($deja_regle > 0)
@@ -483,13 +487,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			$index++;
 			$pdf->SetTextColor(0,0,60);
-			//$pdf->SetFont('','B', 9);
+			//$pdf->SetFont('','B', $default_font_size - 1);
 			$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
-			$pdf->SetFont('','', 9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetTextColor(0,0,0);
 		}
 
@@ -505,9 +509,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	{
 		global $conf;
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		// Montants exprimes en     (en tab_top - 1
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('','',$default_font_size - 2);
 		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top -3);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@@ -519,7 +525,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		// line prend une position y en 3eme param
 		$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
 
-		$pdf->SetFont('','',10);
+		$pdf->SetFont('','', $default_font_size);
 
 		$pdf->SetXY ($this->posxdesc-1, $tab_top+2);
 		$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -567,13 +573,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$tab3_width = 80;
 		$tab3_height = 4;
 
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('','', $default_font_size - 2);
 		$pdf->SetXY ($tab3_posx, $tab3_top - 5);
 		$pdf->MultiCell(60, 5, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
 
 		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
 
-		$pdf->SetFont('','',6);
+		$pdf->SetFont('','', $default_font_size - 4);
 		$pdf->SetXY ($tab3_posx, $tab3_top );
 		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
 		$pdf->SetXY ($tab3_posx+21, $tab3_top );
@@ -585,7 +591,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$y=0;
 
-		$pdf->SetFont('','',6);
+		$pdf->SetFont('','', $default_font_size - 4);
 
 		// Loop on each payment
 		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount,";
@@ -644,11 +650,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$outputlangs->load("orders");
 		$outputlangs->load("companies");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		// Do not add the BACKGROUND as this is for suppliers
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 
 		$posy=$this->marge_haute;
 
@@ -666,7 +674,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			else
 			{
 				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
@@ -677,11 +685,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		//}
 
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("SupplierInvoice")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
-		$pdf->SetFont('','',12);
+		$pdf->SetFont('','', $default_font_size + 2);
 
 		$posy+=6;
 		$pdf->SetXY(100,$posy);
@@ -702,7 +710,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$posy=42;
 			$hautcadre=40;
 			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','',8);
+			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche,$posy-5);
 			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillTo").":",0,"L");
 
@@ -716,21 +724,21 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			// Nom emetteur
 			$carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFont('','B',10);
+			$pdf->SetFont('','B', $default_font_size);
 			$pdf->SetXY($this->marge_gauche+2,$posy+3);
 			$pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L');
 
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs,$mysoc);
 
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetXY($this->marge_gauche+2,$posy+8);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 			// Client destinataire
 			$posy=42;
 			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','',8);
+			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY(100,$posy-5);
 			$pdf->MultiCell(96, 4, $outputlangs->transnoentities("Supplier").":");
 			//
@@ -759,10 +767,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			// Show customer/recipient
 			$pdf->SetXY(102,$posy+3);
-			$pdf->SetFont('','B',10);
+			$pdf->SetFont('','B', $default_font_size);
 			$pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
 
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetXY(102,$posy+8);
 			$pdf->MultiCell(96,4, $carac_client, 0, 'L');
 		}
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 0792872fed3..0a6fa0748bb 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -113,6 +113,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$outputlangs->load("products");
 		$outputlangs->load("orders");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		if ($conf->fournisseur->dir_output.'/commande')
 		{
 			$deja_regle = "";
@@ -194,7 +196,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', 9);
+				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
 
@@ -208,7 +210,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$tab_top = 88;
 
-					$pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
+					$pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 					$pdf->SetXY ($this->posxdesc-1, $tab_top);
 					$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($object->note_public), 0, 'L');
 					$nexY = $pdf->GetY();
@@ -235,14 +237,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$curY = $nexY;
 
-                    $pdf->SetFont('','', 9);   // Dans boucle pour gerer multi-page
+                    $pdf->SetFont('','', $default_font_size - 1);   // Dans boucle pour gerer multi-page
 
                     // Description de la ligne produit
 					//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs,0,0,1);
 					pdf_writelinedesc($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);
 
-					$pdf->SetFont('','', 9);   // On repositionne la police par defaut
+					$pdf->SetFont('','', $default_font_size - 1);   // On repositionne la police par defaut
 					$nexY = $pdf->GetY();
 
 					// TVA
@@ -306,7 +308,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->AddPage();
 						$pagenb++;
 						$this->_pagehead($pdf, $object, 0, $outputlangs);
-						$pdf->SetFont('','', 9);
+						$pdf->SetFont('','', $default_font_size - 1);
 						$pdf->MultiCell(0, 3, '');		// Set interline to 3
 						$pdf->SetTextColor(0,0,0);
 
@@ -342,7 +344,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$pdf->SetXY ($this->marge_gauche, 228);
 					$pdf->SetTextColor(200,0,0);
-					$pdf->SetFont('','B',8);
+					$pdf->SetFont('','B', $default_font_size - 2);
 					$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
 					$pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorCreateBankAccount"),0,'L',0);
 					$pdf->SetTextColor(0,0,0);
@@ -389,7 +391,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	{
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', 9);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+		$pdf->SetFont('','', $default_font_size - 1);
 
 		$pdf->SetXY ($this->marge_gauche, $tab2_top + 0);
 
@@ -479,7 +482,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
-		$pdf->SetFont('','', 9);
+		$pdf->SetFont('','', $default_font_size - 1);
 		$pdf->SetTextColor(0,0,0);
 
 		if ($deja_regle > 0)
@@ -494,13 +497,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			$index++;
 			$pdf->SetTextColor(0,0,60);
-			//$pdf->SetFont('','B', 9);
+			//$pdf->SetFont('','B', $default_font_size - 1);
 			$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
-			$pdf->SetFont('','', 9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetTextColor(0,0,0);
 		}
 
@@ -518,7 +521,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Montants exprimes en     (en tab_top - 1
 		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('','', $default_font_size - 2);
 		$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top -3);
 		$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@@ -530,7 +533,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// line prend une position y en 3eme param
 		$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);
 
-		$pdf->SetFont('','',10);
+		$pdf->SetFont('','', $default_font_size);
 
 		$pdf->SetXY ($this->posxdesc-1, $tab_top+2);
 		$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -579,11 +582,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$outputlangs->load("orders");
 		$outputlangs->load("companies");
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		// Do not add the BACKGROUND as this is for suppliers
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B',$default_font_size + 3);
 
 		$posy=$this->marge_haute;
 
@@ -600,7 +605,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			else
 			{
 				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',8);
+				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
@@ -611,11 +616,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
-		$pdf->SetFont('','B',13);
+		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
-		$pdf->SetFont('','',12);
+		$pdf->SetFont('','', $default_font_size + 2);
 
 		$posy+=6;
 		$pdf->SetXY(100,$posy);
@@ -636,7 +641,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$posy=42;
 			$hautcadre=40;
 			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','',8);
+			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche,$posy-5);
 			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillTo").":",0,'L');
 
@@ -650,21 +655,21 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Nom emetteur
 			$carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom);
 			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFont('','B',10);
+			$pdf->SetFont('','B', $default_font_size);
 			$pdf->SetXY($this->marge_gauche+2,$posy+3);
 			$pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L');
 
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs,$mysoc);
 
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetXY($this->marge_gauche+2,$posy+8);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 			// Client destinataire
 			$posy=42;
 			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','',8);
+			$pdf->SetFont('','', $default_font_size - 2);
 			$pdf->SetXY(100,$posy-5);
 			$pdf->MultiCell(96, 4, $outputlangs->transnoentities("Supplier").":");
 			//
@@ -693,10 +698,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			// Show customer/recipient
 			$pdf->SetXY(102,$posy+3);
-			$pdf->SetFont('','B',10);
+			$pdf->SetFont('','B', $default_font_size);
 			$pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
 
-			$pdf->SetFont('','',9);
+			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetXY(102,$posy+8);
 			$pdf->MultiCell(96,4, $carac_client, 0, 'L');
 		}