From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 11 Feb 2010 13:49:53 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1532a014c30e8d0fa5e67f430021f59aa64b24be;p=cubeextranet.git

---

diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index 6a6bfa078..c3067cd2a 100644
--- a/inc/extranet/Metier/class.extranet.document.php
+++ b/inc/extranet/Metier/class.extranet.document.php
@@ -18,11 +18,11 @@ abstract class extranetDocument extends cubeMetier {
 	public function saveAsPDF()
 	{
 		$cesure = $this->testPDF();
-		if($this->isFacture() && $cesure){
-			$cesure=false;
-			$displayDescription=false;
-		}else{
-			$displayDescription=true;
+		if ($this->isFacture() && $cesure) {
+			$cesure = false;
+			$displayDescription = false;
+		} else {
+			$displayDescription = true;
 		}
 
 		$pdf = new FPDF('P', 'mm', 'A4');
@@ -38,22 +38,21 @@ abstract class extranetDocument extends cubeMetier {
 		$pdf->SetTextColor(0, 0, 0);
 		// Bloc adresse
 		if (trim($this->adresse) == '') {
-			$pdf->SetXY(114, 45);
-			$pdf->SetFont('Helvetica', 'B', 11);
-			$pdf->MultiCell(80, 8, self::escape($this->client->rs), 0, 2);
-			$pdf->SetX(114);
-			$pdf->SetFont('Helvetica', '', 11);
-			$pdf->MultiCell(80, 6, self::escape(trim($this->client->adresse) . "\n" . $this->client->code_postal . " " . $this->client->ville . "\n" . cubeCountry::getCountry($this->client->pays)));
+			$client = self::escape($this->client->rs);
+			$adresse = self::escape(trim($this->client->adresse) . "\n" . $this->client->code_postal . " " . $this->client->ville . "\n" . cubeCountry::getCountry($this->client->pays));
 		} else {
 			$l = explode("\n", trim($this->adresse));
 			$l0 = array_shift($l);
-			$pdf->SetXY(114, 45);
-			$pdf->SetFont('Helvetica', 'B', 11);
-			$pdf->MultiCell(80, 8, self::escape($l0), 0, 2);
-			$pdf->SetX(114);
-			$pdf->SetFont('Helvetica', '', 11);
-			$pdf->MultiCell(80, 6, self::escape(implode("\n", $l)));
+
+			$client = self::escape($l0);
+			$adresse = self::escape(implode("\n", $l));
 		}
+		$pdf->SetXY(114, 45);
+		$pdf->SetFont('Helvetica', 'B', 11);
+		$pdf->MultiCell(80, 8, $client, 0, 2);
+		$pdf->SetX(114);
+		$pdf->SetFont('Helvetica', '', 11);
+		$pdf->MultiCell(80, 6, $adresse);
 		// Bloc TVA Intra
 		if ($this instanceof extranetFacture) {
 			$texte_tva = '';