From 9aa86d870fb8320650d13ba88a3fbea69f60569d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Jun 2008 01:56:34 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20bug=20#22074=20:=20Probl=E8me=20d'affich?= =?UTF-8?q?age=20sur=20propale=20avec=20contact?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/modules/commande/pdf_edison.modules.php | 9 +++------ .../includes/modules/commande/pdf_einstein.modules.php | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index eab62df824b..c5285def3a8 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2007 Laurent Destailleur - * Copyright (C) 2008 Raphael Bertrand (Resultic) + * Copyright (C) 2008 Raphael Bertrand (Resultic) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,16 +17,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ - * - * $Id$ - * $Source$ */ /** \file htdocs/includes/modules/commande/pdf_edison.modules.php \ingroup commande \brief Fichier de la classe permettant de générer les commandes au modèle Edison - \version $Revision$ + \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); @@ -377,7 +374,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetXY(102,42); $pdf->MultiCell(96,5, $com->client->nom); $pdf->SetFont('Arial','B',11); - $pdf->SetXY(102,47); + $pdf->SetXY(102,$pdf->GetY()); $pdf->MultiCell(96,5, $com->client->adresse . "\n" . $com->client->cp . " " . $com->client->ville); $pdf->rect(100, 40, 100, 40); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index d963957abe5..123a49f4de7 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -913,7 +913,7 @@ class pdf_einstein extends ModelePDFCommandes // Nom societe $pdf->SetXY(102,$posy+3); $pdf->SetFont('Arial','B',11); - $pdf->MultiCell(106,4, $object->client->nom, 0, 'L'); + $pdf->MultiCell(96,4, $object->client->nom, 0, 'L'); // Nom client $carac_client = "\n".$object->contact->getFullName($outputlangs,1);