From f22aa12c2d5d00a5bc019a0f4df03424a157efc8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Jun 2009 18:57:34 +0000 Subject: [PATCH] Add hidden option MAIN_USE_BACKGROUND_ON_PDF --- .../includes/modules/action/rapport.pdf.php | 3 ++ .../modules/commande/pdf_edison.modules.php | 2 ++ .../modules/commande/pdf_einstein.modules.php | 2 ++ .../pdf/pdf_expedition_merou.modules.php | 20 +++++++++++++ .../pdf/pdf_expedition_rouget.modules.php | 2 ++ .../modules/facture/pdf_crabe.modules.php | 2 ++ .../modules/facture/pdf_oursin.modules.php | 2 ++ .../livraison/pdf/pdf_sirocco.modules.php | 2 ++ .../livraison/pdf/pdf_typhon.modules.php | 2 ++ .../propale/pdf_propale_azur.modules.php | 2 ++ .../propale/pdf_propale_jaune.modules.php | 2 ++ .../modules/rapport/pdf_paiement.class.php | 3 ++ .../pdf/pdf_muscadet.modules.php | 3 ++ htdocs/lib/pdf.lib.php | 29 +++++++++++++++---- 14 files changed, 71 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index bf0ffe8d18a..9bf4515eb4f 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -230,6 +230,9 @@ class CommActionRapport { global $conf,$langs; + // Do not add the BACKGROUND as this is a report + //pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + // New page $pdf->AddPage(); diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 3776156e141..9056b58c0b0 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -352,6 +352,8 @@ class pdf_edison extends ModelePDFCommandes global $conf,$langs,$mysoc; $langs->load("orders"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 0399fc2a192..1af2a3ec7b7 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -704,6 +704,8 @@ class pdf_einstein extends ModelePDFCommandes $outputlangs->load("propal"); $outputlangs->load("companies"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 02a1554791e..b05e120d739 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -321,6 +321,26 @@ Class pdf_expedition_merou extends ModelePdfExpedition { global $conf, $langs; + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + + //Affiche le filigrane brouillon - Print Draft Watermark + if($object->statut==0 && (! empty($conf->global->SENDING_DRAFT_WATERMARK)) ) + { + $watermark_angle=atan($this->page_hauteur/$this->page_largeur); + $watermark_x=5; + $watermark_y=$this->page_hauteur-25; //Set to $this->page_hauteur-50 or less if problems + $watermark_width=$this->page_hauteur; + $pdf->SetFont('Arial','B',50); + $pdf->SetTextColor(255,192,203); + //rotate + $pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$pdf->k,($pdf->h-$watermark_y)*$pdf->k,-$watermark_x*$pdf->k,-($pdf->h-$watermark_y)*$pdf->k)); + //print watermark + $pdf->SetXY($watermark_x,$watermark_y); + $pdf->Cell($watermark_width,25,$outputlangs->convToOutputCharset($conf->global->SENDING_DRAFT_WATERMARK),0,2,"C",0); + //antirotate + $pdf->_out('Q'); + } + $Xoff = 90; $Yoff = 0; diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index d7ef58a3852..b8b126d8001 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -78,6 +78,8 @@ Class pdf_expedition_rouget extends ModelePdfExpedition global $conf,$langs,$mysoc; $langs->load("orders"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->SENDING_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index dec54dd21b8..72b179e471c 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -884,6 +884,8 @@ class pdf_crabe extends ModelePDFFactures $outputlangs->load("propal"); $outputlangs->load("companies"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 8189ed7a009..620363dd007 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -785,6 +785,8 @@ class pdf_oursin extends ModelePDFFactures $langs->load("propal"); $langs->load("companies"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index b865f8322dc..5c32888025c 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -348,6 +348,8 @@ class pdf_sirocco extends ModelePDFDeliveryOrder { global $langs,$conf,$mysoc; + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',13); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 58657de876d..dc3d413ca2a 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -432,6 +432,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder { global $langs,$conf,$mysoc; + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',13); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index ccdeef7dbee..e3af89f965e 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -757,6 +757,8 @@ class pdf_propale_azur extends ModelePDFPropales $outputlangs->load("propal"); $outputlangs->load("companies"); + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) ) { diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 7b755c8d9bb..6aa5f426066 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -346,6 +346,8 @@ class pdf_propale_jaune extends ModelePDFPropales { global $conf,$langs; + pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + //Affiche le filigrane brouillon - Print Draft Watermark if($object->statut==0 && defined("PROPALE_DRAFT_WATERMARK") ) { diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 4df8c1f4866..fd05eb0d381 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php @@ -217,6 +217,9 @@ class pdf_paiement extends FPDF { global $langs; + // Do not add the BACKGROUND as this is a report + //pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + $title=$outputlangs->transnoentities("ListOfCustomerPayments"); $title.=' - '.dol_print_date(dol_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs,true); $pdf->SetFont('Arial','B',12); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index bf047153e05..4ae61bdee23 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -583,6 +583,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $outputlangs->load("orders"); $outputlangs->load("companies"); + // Do not add the BACKGROUND as this is for suppliers + //pdf_pagehead($pdf,$outputlangs,$pdf->page_hauteur); + $pdf->SetTextColor(0,0,60); $pdf->SetFont('Arial','B',13); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 70453607621..4df353e8187 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -20,12 +20,31 @@ */ /** - * \file htdocs/lib/company.lib.php - * \brief Ensemble de fonctions de base pour le module societe - * \ingroup societe + * \file htdocs/lib/pdf.lib.php + * \brief Set of functions used for PDF generation + * \ingroup core * \version $Id$ */ + +/** + * \brief Show header of page for PDF generation + * \param pdf Object PDF + * \param outputlang Object lang for output + * \param page_height + */ +function pdf_pagehead(&$pdf,$outputlangs,$page_height) +{ + global $conf; + + // Add a background image on document + if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) + { + $pdf->Image($conf->societe->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, 0, 0, 0, $page_height); + } +} + + /** * \brief Show bank informations for PDF generation */ @@ -269,9 +288,9 @@ function pdf_getlinedesc($line,$outputlangs,$showref=1) $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." "; } } - + if ($showref) $ref_prodserv = $prodser->ref." - "; - + $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice; } }