(no commit message)

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