From c11acda907c725aee7c95386ef36d952da2a73de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 5 Apr 2010 13:17:55 +0000
Subject: [PATCH] Mutualize code. Prepare to build recipient address in same
 function.

---
 .../modules/commande/pdf_einstein.modules.php | 23 +++++-------
 .../pdf/pdf_expedition_merou.modules.php      | 35 +++++--------------
 .../modules/facture/pdf_crabe.modules.php     | 21 +++++------
 .../modules/facture/pdf_oursin.modules.php    | 22 +++++-------
 .../livraison/pdf/pdf_sirocco.modules.php     | 24 +++++--------
 .../livraison/pdf/pdf_typhon.modules.php      | 24 +++++--------
 .../propale/pdf_propale_azur.modules.php      | 25 ++++++-------
 .../propale/pdf_propale_jaune.modules.php     | 25 ++++++-------
 8 files changed, 72 insertions(+), 127 deletions(-)

diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index f07bb7f0806..c86dee96601 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -831,26 +831,21 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				// Recipient name
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-				// Customer name
-				$carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
-
-				// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
 				// Recipient name
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-				// Recipient properties
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 			}
-			// Numero TVA intracom
+
+			$carac_client='';
+			// Recipient name
+			if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+			// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+			// Intra VAT
 			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 			// Show customer/recipient
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 fdbebcbbeea..4b61bfc67a0 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -508,38 +508,21 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 		{
 			$socname = $object->client->nom;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-			// Customer name
-			$carac_client = $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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
-		}
-		else if (!empty($object->fk_delivery_address))
-		{
-			$object->fetch_adresse_livraison($object->fk_delivery_address);
-
-			// Customer name
-			$carac_client_name=$outputlangs->convToOutputCharset($object->deliveryaddress->nom);
-
-			// Customer properties
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->deliveryaddress->address);
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->deliveryaddress->cp) . " " . $outputlangs->convToOutputCharset($object->deliveryaddress->ville)."\n";
-			if ($object->deliveryaddress->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->deliveryaddress->pays_code))."\n";
 		}
 		else
 		{
 			// Recipient name
 			$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-			// Recipient properties
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 		}
-		// Numero TVA intracom
+
+		$carac_client='';
+		// Recipient name
+		if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+		// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+		// Intra VAT
 		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 ce363dcee90..b8ee750a808 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -1101,25 +1101,20 @@ class pdf_crabe extends ModelePDFFactures
 				if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
 				else $socname = $object->client->nom;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-				// Recipient name
-				$carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
-
-				// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
 				// Recipient name
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-				// Recipient properties
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n";
 			}
+
+			$carac_client='';
+			// Recipient name
+			if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+			// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			// Intra VAT
 			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_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index a48fc37470c..c9afc864c2f 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -888,26 +888,20 @@ class pdf_oursin extends ModelePDFFactures
 			if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
 			else $socname = $object->client->nom;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-			// Customer name
-			$carac_client = "\n".$outputlangs->convToOutputCharset($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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->contact->pays_code)."\n";
 		}
 		else
 		{
 			// Recipient name
 			$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-			// Recipient properties
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";
 		}
-		// Numero TVA intracom
+		$carac_client='';
+		// Recipient name
+		if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+		// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+		// Intra VAT
 		if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 		// Show customer/recipient
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index be22382140b..a413c3002a4 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -395,28 +395,22 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 		{
 			$socname = $object->client->nom;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-			// Customer name
-			$carac_client = $outputlangs->convToOutputCharset($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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 		}
 		else
 		{
 			// Recipient name
 			$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-			// Recipient properties
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code && $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);
 
+		$carac_client='';
+		// Recipient name
+		if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+		// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+		// Intra VAT
+		if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 		$pdf->SetTextColor(0,0,0);
 		$pdf->SetFont('Arial','B',12);
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index 6be887146a0..9e6384d24bf 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -622,28 +622,22 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 				$socname = $object->client->nom;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-				// Customer name
-				$carac_client = $outputlangs->convToOutputCharset($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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
 				// Recipient name
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-				// Recipient properties
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code && $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);
 
+			$carac_client='';
+			// Recipient name
+			if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+			// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+			// Intra VAT
+			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 			// Show customer/recipient
 			$pdf->SetXY(102,$posy+3);
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 843e2430658..4b3c808ef80 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -903,27 +903,22 @@ class pdf_propale_azur extends ModelePDFPropales
 				if ($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) $socname = $object->contact->socname;
 				else $socname = $object->client->nom;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
-
-				// Nom client
-				$carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
-
-				// 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 			}
 			else
 			{
 				// Recipient name
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-
-				// Recipient properties
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-				$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-				if ($object->client->pays_code && $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").': '.$object->client->tva_intra;
+
+			$carac_client='';
+			// Recipient name
+			if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+			// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+			// Intra VAT
+			if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 			// Show recipient
 			$posy=42;
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 141cb2344b3..ffcc800a46a 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -598,14 +598,6 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$pdf->SetXY(102,$posy+3);
 			$pdf->SetFont('Arial','B',11);
 			$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L');
-
-			// Nom client
-			$carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
-
-			// 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
 		}
 		else
 		{
@@ -613,14 +605,17 @@ class pdf_propale_jaune extends ModelePDFPropales
 			$pdf->SetXY(102,$posy+3);
 			$pdf->SetFont('Arial','B',11);
 			$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L');
-
-			// Recipient properties
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
-			$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n";
-			if ($object->client->pays_code && $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").': '.$object->client->tva_intra;
+
+		$carac_client='';
+		// Recipient name
+		if ($usecontact) $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1));
+		// Recipient 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 && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n";
+		// Intra VAT
+		if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($object->client->tva_intra);
 
 		$pdf->SetFont('Arial','',9);
 		$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name