(no commit message)

diff --git a/inc/extranet/Metier/class.extranet.devis.php b/inc/extranet/Metier/class.extranet.devis.php
index a30b4ddf673d2bfe6976ca6532d80b7a431fd32e..3b3342d0dbb80f0442774ed199361695a544af18 100644 (file)
--- 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;\r
                return $titre;\r
        }\r
+\r
+       protected function isFacture()\r
+       {\r
+               return false;\r
+       }\r
 }\r
 \r
 ?>
\ 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 3af2aaa5e6e8197911e0cd0681a60c2f6ca921e2..d61e063edf31ccfcb1a38b1130cd5389af640a4e 100644 (file)
--- 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()\r
        {\r
                $cesure = $this->testPDF();\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
                $pdf->SetAutoPageBreak(false);\r
@@ -67,12 +73,12 @@ abstract class extranetDocument extends cubeMetier {
                $pdf->SetXY(15, 70);\r
                $titre = $this->documentTitre($this->client->lang);\r
                $pdf->SetFont('Helvetica', 'B', 10);\r
-               $pdf->MultiCell(73, 4, self::escape($titre),0,'L');\r
+               $pdf->MultiCell(73, 4, self::escape($titre), 0, 'L');\r
                // blocs\r
                $pdf->setY(105);\r
                foreach($this->lignes as $i => $ligne) {\r
                        if ($cesure && $i == $cesure) {\r
-                       fb($pdf);\r
+                               fb($pdf);\r
                                $pdf->AddPage();\r
                                $pdf->Image($this->fond2, 10, 10, 194.1);\r
                                $pdf->setY(20);\r
@@ -93,9 +99,11 @@ abstract class extranetDocument extends cubeMetier {
                        $pdf->setXY(13, $y);\r
                        $pdf->Cell(151, 4, self::escape(trim($ligne['titre'])), 0, 1);\r
                        // Contenu\r
-                       $pdf->SetX(13);\r
-                       $pdf->SetFont('Helvetica', '', 10);\r
-                       $pdf->MultiCell(151, 4, self::escape(trim($ligne['description'])));\r
+                       if ($displayDescription) {\r
+                               $pdf->SetX(13);\r
+                               $pdf->SetFont('Helvetica', '', 10);\r
+                               $pdf->MultiCell(151, 4, self::escape(trim($ligne['description'])));\r
+                       }\r
                }\r
                // Prix\r
                $tva = cubeTaxes::tva($this->client->pays);\r

diff --git a/inc/extranet/Metier/class.extranet.facture.php b/inc/extranet/Metier/class.extranet.facture.php
index 7d7be27191363328026c2c85874312f8542ea7ac..56f8ae8386e9560f774ca41294dfcf6b68168875 100644 (file)
--- 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;\r
                return $titre;\r
        }\r
+\r
+       protected function isFacture(){\r
+               return true;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file