From 16ad5452b681dc1902787ae33200245a257461d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Feb 2012 14:27:19 +0100 Subject: [PATCH] Fix: When company name is too long, wrapping overwrite address. --- .../commande/doc/pdf_edison.modules.php | 4 +-- .../commande/doc/pdf_einstein.modules.php | 4 +-- .../doc/pdf_expedition_merou.modules.php | 27 ++++++++++--------- .../doc/pdf_expedition_rouget.modules.php | 4 +-- .../modules/facture/doc/pdf_crabe.modules.php | 12 ++++----- .../facture/doc/pdf_oursin.modules.php | 4 +-- .../fichinter/doc/pdf_soleil.modules.php | 10 +++---- .../livraison/pdf/pdf_sirocco.modules.php | 2 +- .../livraison/pdf/pdf_typhon.modules.php | 2 +- .../modules/propale/doc/pdf_azur.modules.php | 4 +-- .../modules/propale/doc/pdf_jaune.modules.php | 4 +-- .../pdf/pdf_canelle.modules.php | 4 +-- .../pdf/pdf_muscadet.modules.php | 4 +-- 13 files changed, 42 insertions(+), 43 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index 6c802f673f3..0da4c51ca34 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -611,7 +611,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -620,7 +620,7 @@ class pdf_edison extends ModelePDFCommandes // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index e3b43203cf6..ffe6d287de8 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -982,7 +982,7 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -991,7 +991,7 @@ class pdf_einstein extends ModelePDFCommandes // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } } 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 dd0878f55b8..68e59eb3f40 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php @@ -42,7 +42,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition /** * Constructor * - * @param DoliDB $DB Database handler + * @param DoliDB $db Database handler */ function pdf_expedition_merou($db=0) { @@ -72,10 +72,11 @@ Class pdf_expedition_merou extends ModelePdfExpedition /** - * \brief Fonction generant le document sur le disque - * \param object Objet expedition a generer (ou id si ancienne methode) - * \param outputlangs Lang output object - * \return int 1=ok, 0=ko + * Fonction generant le document sur le disque + * + * @param object Objet expedition a generer (ou id si ancienne methode) + * @param outputlangs Lang output object + * @return int 1=ok, 0=ko */ function write_file(&$object, $outputlangs) { @@ -200,8 +201,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition // Description de la ligne produit //Creation des cases a cocher - $pdf->rect(10+3, $curY+1, 3, 3); - $pdf->rect(20+3, $curY+1, 3, 3); + $pdf->Rect(10+3, $curY+1, 3, 3); + $pdf->Rect(20+3, $curY+1, 3, 3); //Insertion de la reference du produit $pdf->SetXY(30, $curY+1 ); $pdf->SetFont('','B', $default_font_size - 3); @@ -400,7 +401,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition //Num Expedition $Yoff = $Yoff+7; $Xoff = 142; - //$pdf->rect($Xoff, $Yoff, 85, 8); + //$pdf->Rect($Xoff, $Yoff, 85, 8); $pdf->SetXY($Xoff,$Yoff); $pdf->SetFont('','', $default_font_size - 2); $pdf->SetTextColor(0,0,0); @@ -542,20 +543,20 @@ Class pdf_expedition_merou extends ModelePdfExpedition $blW=50; $Yoff = $Ydef +1; - $pdf->Rect($blDestX, $Yoff-1, $blW, 26); - - //Titre + // Show recipient frame $pdf->SetFont('','B', $default_font_size - 3); $pdf->SetXY($blDestX,$Yoff-4); $pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L'); + $pdf->Rect($blDestX, $Yoff-1, $blW, 26); - // Show customer/recipient + // Show recipient name $pdf->SetFont('','B', $default_font_size - 3); $pdf->SetXY($blDestX,$Yoff); $pdf->MultiCell($blW,3, $carac_client_name, 0, 'L'); + // Show recipient information $pdf->SetFont('','', $default_font_size - 3); - $pdf->SetXY($blDestX,$Yoff+4); + $pdf->SetXY($blDestX,$Yoff+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell($blW,2, $carac_client, 0, 'L'); } } 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 45ec40686d5..22a8b55ca60 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php @@ -517,7 +517,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx,$posy-5); $pdf->MultiCell(80, 4, $outputlangs->transnoentities("Recipient").":", 0, 'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); $pdf->SetTextColor(0,0,0); // Show recipient name @@ -527,7 +527,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 9b8fe8f3aa4..fb7e0ee8b80 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2011 Juanjo Menent @@ -22,7 +22,7 @@ /** * \file htdocs/core/modules/facture/doc/pdf_crabe.modules.php * \ingroup facture - * \brief File of class to generate customers invoices from crab model + * \brief File of class to generate customers invoices from crabe model */ require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); @@ -33,10 +33,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); /** - * \class pdf_crabe - * \brief Classe permettant de generer les factures au modele Crabe + * Class to manage PDF invoice template Crabe */ - class pdf_crabe extends ModelePDFFactures { var $db; @@ -1222,7 +1220,7 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -1231,7 +1229,7 @@ class pdf_crabe extends ModelePDFFactures // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } } diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index 80f2b3706a5..a4e96ce799f 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -905,7 +905,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -914,7 +914,7 @@ class pdf_oursin extends ModelePDFFactures // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index bc0d10ad00f..ea0e332b1b9 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -41,10 +41,10 @@ class pdf_soleil extends ModelePDFFicheinter var $name; var $description; var $type; - + var $phpmin = array(4,3,0); // Minimum version of PHP required by module var $version = 'dolibarr'; - + var $page_largeur; var $page_hauteur; var $format; @@ -299,7 +299,7 @@ class pdf_soleil extends ModelePDFFicheinter } } } - + // Show square if ($pagenb == 1) { @@ -556,7 +556,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx,$posy-5); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); $pdf->SetTextColor(0,0,0); // Show recipient name @@ -566,7 +566,7 @@ class pdf_soleil extends ModelePDFFicheinter // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(100,4, $carac_client, 0, 'L'); } } diff --git a/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php index 22b0592b370..860cabb1fea 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php @@ -395,7 +395,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $pdf->SetFont('','B', $default_font_size); $pdf->SetXY(102,47); $pdf->MultiCell(96,5, $carac_client, 0, 'L'); - $pdf->rect(100, 40, 100, 40); + $pdf->Rect(100, 40, 100, 40); $pdf->SetTextColor(0,0,60); diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 2995e984349..361e9b0c168 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -617,7 +617,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L'); // Cadre client destinataire - $pdf->rect(100, $posy, 100, $hautcadre); + $pdf->Rect(100, $posy, 100, $hautcadre); // If SHIPPING contact defined on invoice, we use it $usecontact=false; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index d2df8d79190..227a354aa66 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1031,7 +1031,7 @@ class pdf_azur extends ModelePDFPropales $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx,$posy-5); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); $pdf->SetTextColor(0,0,0); // Show recipient name @@ -1041,7 +1041,7 @@ class pdf_azur extends ModelePDFPropales // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(100,4, $carac_client, 0, 'L'); } } diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php index 50977092f3f..b4c5f485542 100644 --- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php @@ -1031,7 +1031,7 @@ class pdf_jaune extends ModelePDFPropales $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx,$posy-5); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); $pdf->SetTextColor(0,0,0); // Show recipient name @@ -1041,7 +1041,7 @@ class pdf_jaune extends ModelePDFPropales // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(100,4, $carac_client, 0, 'L'); } } 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 829f6e20420..cda3b1d39fd 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -893,7 +893,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -902,7 +902,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } } 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 7dd01cb4b0d..096cdaae868 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -975,7 +975,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); - $pdf->rect($posx, $posy, 100, $hautcadre); + $pdf->Rect($posx, $posy, 100, $hautcadre); // Show recipient name $pdf->SetXY($posx+2,$posy+3); @@ -984,7 +984,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // Show recipient information $pdf->SetFont('','', $default_font_size - 1); - $pdf->SetXY($posx+2,$posy+8); + $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell(86,4, $carac_client, 0, 'L'); } }