diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 7710bf22a69..2cd7f53bf08 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -854,11 +854,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Customer properties
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
-				//Pays si different de l'emetteur
-				if ($this->emetteur->pays_code != $object->contact->pays_code)
-				{
-					$carac_client.=$outputlangs->convToOutputCharset($carac_client.=$object->contact->pays)."\n";
-				}
+				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
@@ -880,7 +876,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Caracteristiques client
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 			}
 			// Numero TVA intracom
 			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
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 ee623c6e5f8..312c064c0ff 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -498,7 +498,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 			// Customer properties
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
-			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+			if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 		}
 		else
 		{
@@ -520,12 +520,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 			// Caracteristiques client
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-
-			//Pays si different de l'emetteur
-			if ($this->emetteur->pays_code != $object->client->pays_code)
-			{
-				$carac_client.=$outputlangs->convToOutputCharset($object->client->pays)."\n";
-			}
+			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 		}
 		// Numero TVA intracom
 		if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index ac8295243fe..6bb61e99de3 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -1086,7 +1086,7 @@ class pdf_crabe extends ModelePDFFactures
 				// Customer properties
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
-				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n";
+				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
@@ -1108,7 +1108,7 @@ class pdf_crabe extends ModelePDFFactures
 				// Caracteristiques client
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 			}
 			// Numero TVA intracom
 			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index d5e1294739b..57bc3f7c40f 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -430,7 +430,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *   	\param      delivery    object delivery
 	 *      \param      showadress  0=non, 1=oui
 	 */
-	function _pagehead(&$pdf, $delivery, $showadress=1, $outputlangs)
+	function _pagehead(&$pdf, $object, $showadress=1, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -462,15 +462,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$pdf->SetFont('Arial','B',13);
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($delivery->ref), '' , 'R');
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), '' , 'R');
 		$pdf->SetFont('Arial','',12);
 
 		$posy+=6;
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
-		if ($delivery->date_valid)
+		if ($object->date_valid)
 		{
-			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($delivery->date_valid,"%d %b %Y",false,$outputlangs,true), '', 'R');
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_valid,"%d %b %Y",false,$outputlangs,true), '', 'R');
 		}
 		else
 		{
@@ -483,7 +483,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$pdf->SetXY(100,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$commande = new Commande ($this->db);
-		if ($commande->fetch($delivery->origin_id) >0) {
+		if ($commande->fetch($object->origin_id) >0) {
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->convToOutputCharset($commande->ref), '' , 'R');
 		}
 
@@ -542,25 +542,60 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			if ($commande->adresse_livraison_id > 0) {
 				$client->fetch_adresse_livraison($commande->adresse_livraison_id);
 			} else {
-				$client->fetch($delivery->socid);
+				$client->fetch($object->socid);
 			}
-			$delivery->client = $client;
+			$object->client = $client;
 
 			// Cadre client destinataire
 			$pdf->rect(100, $posy, 100, $hautcadre);
 
-			// Nom client
+			// If DELIVERY contact defined, we use it
+			$usecontact=false;
+			if ($usecontact)
+			{
+				// On peut utiliser le nom de la societe du contact facturation
+				if ($conf->global->XXX) $socname = $object->contact->socname;
+				else $socname = $object->client->nom;
+				$carac_client_name=$outputlangs->convToOutputCharset($socname);
+
+				// Customer name
+				$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1);
+
+				// Customer properties
+				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
+				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
+				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+			}
+			else
+			{
+				// Nom client
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+
+				// Nom du contact facturation si c'est une societe
+				$arrayidcontact = $object->getIdContact('external','BILLING');
+				if (sizeof($arrayidcontact) > 0)
+				{
+					$object->fetch_contact($arrayidcontact[0]);
+					// 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);
+					}
+				}
+
+				// Caracteristiques client
+				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
+				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
+				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
+			}
+			// Tva intracom
+			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
+
+			// Show customer/recipient
 			$pdf->SetXY(102,$posy+3);
 			$pdf->SetFont('Arial','B',11);
-			$pdf->MultiCell(106,4, $outputlangs->convToOutputCharset($delivery->client->nom), 0, 'L');
+			$pdf->MultiCell(106,4, $carac_client_name, 0, 'L');
 
-			// Caracteristiques client
-			$carac_client=$outputlangs->convToOutputCharset($delivery->client->adresse)."\n";
-			$carac_client.=$outputlangs->convToOutputCharset($delivery->client->cp) . " " . $outputlangs->convToOutputCharset($delivery->client->ville)."\n";
-			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
-
-			// Tva intracom
-			if ($delivery->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$delivery->client->tva_intra;
 			$pdf->SetFont('Arial','',9);
 			$pdf->SetXY(102,$posy+8);
 			$pdf->MultiCell(86,4, $carac_client);
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 6bf315fb0b1..603dea8f5a4 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -134,7 +134,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			}
 			$propale->fetch_client();
 			$deja_regle = "";
-			
+
 			// Définition de $dir et $file
 			if ($propale->specimen)
 			{
@@ -819,7 +819,7 @@ class pdf_propale_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'R');
 		}
-				
+
 		if ($showadress)
 		{
 			// Emetteur
@@ -904,7 +904,7 @@ class pdf_propale_azur extends ModelePDFPropales
 				// Caractéristiques client
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
-				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n";
+				if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
@@ -926,7 +926,7 @@ class pdf_propale_azur extends ModelePDFPropales
 				// Caractéristiques client
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
 				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+				if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 			}
 			// Numéro TVA intracom
 			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 2cb63e5e5a0..944cdad49f7 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -118,7 +118,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 			}
 			$propale->fetch_client();
 			$deja_regle = "";
-			
+
 			// Definition de $dir et $file
 			if ($propale->specimen)
 			{
@@ -436,7 +436,7 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $object->client->code_client, '', 'R');
 		}
-		
+
 		$posy=39;
 
 
@@ -462,10 +462,10 @@ class pdf_propale_jaune extends ModelePDFPropales
 			// Nom client
 			$carac_client = "\n".$object->contact->getFullName($outputlangs,1,1);
 
-			// Caract�ristiques client
+			// Caracteristiques client
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address);
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n";
-			if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n";
+			if ($object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 		}
 		else
 		{
@@ -474,25 +474,26 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$pdf->SetFont('Arial','B',11);
 			$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L');
 
-			// Nom du contact suivi propal si c'est une soci�t�
+			// Nom du contact suivi propal si c'est une societe
 			$arrayidcontact = $object->getIdContact('external','CUSTOMER');
 			if (sizeof($arrayidcontact) > 0)
 			{
 				$object->fetch_contact($arrayidcontact[0]);
-				// On v�rifie si c'est une soci�t� 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) )
 				{
 					$carac_client .= "\n".$object->contact->getFullName($outputlangs,1,1);
 				}
 			}
 
-			// Caract�ristiques client
+			// Caracteristiques client
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 		}
-		// Num�ro TVA intracom
+		// Numero TVA intracom
 		if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
+
 		$pdf->SetFont('Arial','',9);
 		$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
 		$pdf->SetXY(102,$posy+6);
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 d77eae0bb78..7a2cdf23958 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -687,7 +687,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			$carac_client=$outputlangs->convToOutputCharset($object->client->adresse);
 			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
+			if ($object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 
 			// Numero TVA intracom
 			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);