From 1199e61f4ba59d3803f629a4999036e41b1bc093 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 26 Jul 2013 12:33:58 +0200
Subject: [PATCH] CRLF issue

---
 .../livraison/pdf/pdf_typhon.modules.php       | 14 +++++++-------
 .../modules/propale/doc/pdf_azur.modules.php   | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index 2daef285bce..995815a0724 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -636,13 +636,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
-
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
+
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
+
+		$pdf->SetXY($this->marge_gauche,$posy);
 
 		// Logo
 		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index e16a0da6a7c..400eed36854 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -275,8 +275,8 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->SetTextColor(0,0,0);
 
 					// Define size of image if we need it
-					$imglinesize=array(); $realpath='';
-					if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+					$imglinesize=array(); $realpath='';
+					if (! empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
 					{
 						if ($object->lines[$i]->fk_product)
 						{
@@ -347,13 +347,13 @@ class pdf_azur extends ModelePDFPropales
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-						{
-							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
-						}
-						else
-						{
-							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						if (empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+						}
+						else
+						{
+							pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 						}
 
 						$pageposafter=$pdf->getPage();