From bac0f5e48ef403b7301332530500454481dbf842 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 25 Nov 2009 18:15:31 +0000
Subject: [PATCH]

---
 inc/extranet/Metier/class.extranet.devis.php   |  5 +++++
 .../Metier/class.extranet.document.php         | 18 +++++++++++++-----
 inc/extranet/Metier/class.extranet.facture.php |  4 ++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/inc/extranet/Metier/class.extranet.devis.php b/inc/extranet/Metier/class.extranet.devis.php
index a30b4ddf6..3b3342d0d 100644
--- a/inc/extranet/Metier/class.extranet.devis.php
+++ b/inc/extranet/Metier/class.extranet.devis.php
@@ -22,6 +22,11 @@ class extranetDevis extends extranetDocument {
 		$titre .= "\n\n" . $this->nom;
 		return $titre;
 	}
+
+	protected function isFacture()
+	{
+		return false;
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index 3af2aaa5e..d61e063ed 100644
--- a/inc/extranet/Metier/class.extranet.document.php
+++ b/inc/extranet/Metier/class.extranet.document.php
@@ -18,6 +18,12 @@ abstract class extranetDocument extends cubeMetier {
 	public function saveAsPDF()
 	{
 		$cesure = $this->testPDF();
+		if($this->isFacture() && $cesure){
+			$cesure=false;
+			$displayDescription=false;
+		}else{
+			$displayDescription=true;
+		}
 
 		$pdf = new FPDF('P', 'mm', 'A4');
 		$pdf->SetAutoPageBreak(false);
@@ -67,12 +73,12 @@ abstract class extranetDocument extends cubeMetier {
 		$pdf->SetXY(15, 70);
 		$titre = $this->documentTitre($this->client->lang);
 		$pdf->SetFont('Helvetica', 'B', 10);
-		$pdf->MultiCell(73, 4, self::escape($titre),0,'L');
+		$pdf->MultiCell(73, 4, self::escape($titre), 0, 'L');
 		// blocs
 		$pdf->setY(105);
 		foreach($this->lignes as $i => $ligne) {
 			if ($cesure && $i == $cesure) {
-			fb($pdf);
+				fb($pdf);
 				$pdf->AddPage();
 				$pdf->Image($this->fond2, 10, 10, 194.1);
 				$pdf->setY(20);
@@ -93,9 +99,11 @@ abstract class extranetDocument extends cubeMetier {
 			$pdf->setXY(13, $y);
 			$pdf->Cell(151, 4, self::escape(trim($ligne['titre'])), 0, 1);
 			// Contenu
-			$pdf->SetX(13);
-			$pdf->SetFont('Helvetica', '', 10);
-			$pdf->MultiCell(151, 4, self::escape(trim($ligne['description'])));
+			if ($displayDescription) {
+				$pdf->SetX(13);
+				$pdf->SetFont('Helvetica', '', 10);
+				$pdf->MultiCell(151, 4, self::escape(trim($ligne['description'])));
+			}
 		}
 		// Prix
 		$tva = cubeTaxes::tva($this->client->pays);
diff --git a/inc/extranet/Metier/class.extranet.facture.php b/inc/extranet/Metier/class.extranet.facture.php
index 7d7be2719..56f8ae838 100644
--- a/inc/extranet/Metier/class.extranet.facture.php
+++ b/inc/extranet/Metier/class.extranet.facture.php
@@ -45,6 +45,10 @@ class extranetFacture extends extranetDocument {
 		$titre .= "\n\n" . $this->nom;
 		return $titre;
 	}
+
+	protected function isFacture(){
+		return true;
+	}
 }
 
 ?>
\ No newline at end of file
-- 
2.39.5