From 97f009525158cf0dc25f676dfe9992896548fc81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Tue, 20 Mar 2012 09:22:41 +0100 Subject: [PATCH] PDF are better with all PDF sizes --- htdocs/core/modules/commande/doc/pdf_edison.modules.php | 2 +- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 4 ++-- .../modules/expedition/doc/pdf_expedition_merou.modules.php | 2 +- .../modules/expedition/doc/pdf_expedition_rouget.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++-- htdocs/core/modules/facture/doc/pdf_oursin.modules.php | 5 ++--- htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php | 2 +- htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php | 2 +- htdocs/core/modules/project/pdf/pdf_baleine.modules.php | 2 +- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 4 ++-- htdocs/core/modules/propale/doc/pdf_jaune.modules.php | 4 ++-- .../modules/supplier_invoice/pdf/pdf_canelle.modules.php | 4 ++-- .../core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 4 ++-- 13 files changed, 20 insertions(+), 21 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index 962100e8b16..894efc2d7be 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -547,7 +547,7 @@ class pdf_edison extends ModelePDFCommandes { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index b264fa4c73e..f14dc4199ab 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -606,7 +606,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $useborder=0; $index = 0; @@ -890,7 +890,7 @@ class pdf_einstein extends ModelePDFCommandes { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); // width=0 (auto), max height=24 + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php index a76aea8c5b8..e5c8a7099cb 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php @@ -382,7 +382,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition { if (is_readable($logo)) { - $pdf->Image($logo,10, 5, 0, 22); + $pdf->Image($logo,10, 5, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php index 6b1a62e8f3a..07be573a5d6 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php @@ -344,7 +344,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 3c14c484057..ea9987acc97 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -727,7 +727,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $useborder=0; $index = 0; @@ -1034,7 +1034,7 @@ class pdf_crabe extends ModelePDFFactures { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); // width=0 (auto), max height=24 + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index ee1e51d3c86..3d17e5b4b49 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -617,8 +617,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164; - $lltot = 200; $largcol2 = $lltot - $col2x; + $col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $pdf->SetXY($this->marges['g'], $tab2_top + 0); @@ -837,7 +836,7 @@ class pdf_oursin extends ModelePDFFactures { $taille=getimagesize($logo); $length=$taille[0]/2.835; - $pdf->Image($logo, $this->marges['g'], $this->marges['h'], 0, 24); + $pdf->Image($logo, $this->marges['g'], $this->marges['h'], 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index e6ed5c267db..1309cc243b5 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -445,7 +445,7 @@ class pdf_soleil extends ModelePDFFicheinter { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 000b5537424..96fd21e87ee 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -511,7 +511,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php index 11b9fab9f42..db1adedfb2f 100644 --- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -352,7 +352,7 @@ class pdf_baleine extends ModelePDFProjects { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index e5218d17829..37a50c64007 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -623,7 +623,7 @@ class pdf_azur extends ModelePDFPropales $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); // Total HT $pdf->SetFillColor(255,255,255); @@ -924,7 +924,7 @@ class pdf_azur extends ModelePDFPropales { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php index 5673b38463f..81743d362f5 100644 --- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php @@ -609,7 +609,7 @@ class pdf_jaune extends ModelePDFPropales $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); // Total HT $pdf->SetFillColor(255,255,255); @@ -909,7 +909,7 @@ class pdf_jaune extends ModelePDFPropales { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 490866ea655..f1f66f6b386 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -457,7 +457,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices } // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); // Total HT $pdf->SetFillColor(255,255,255); @@ -805,7 +805,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index da2c981e998..0873468a3c5 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -595,7 +595,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','', $default_font_size - 1); // Tableau total - $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x; + $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x); $useborder=0; $index = 0; @@ -874,7 +874,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders { if (is_readable($logo)) { - $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); + $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22 } else { -- GitLab