lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bug #22074 : Problme d'affichage sur propale avec contact

Browse Source
This commit is contained in:
Laurent Destailleur 2008-06-11 01:56:34 +00:00
parent 9b68fc591e
commit 9aa86d870f
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/ * or see http://www.gnu.org/
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/includes/modules/commande/pdf_edison.modules.php \file htdocs/includes/modules/commande/pdf_edison.modules.php
\ingroup commande \ingroup commande
\brief Fichier de la classe permettant de générer les commandes au modèle Edison \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"); 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->SetXY(102,42);
$pdf->MultiCell(96,5, $com->client->nom); $pdf->MultiCell(96,5, $com->client->nom);
$pdf->SetFont('Arial','B',11); $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->MultiCell(96,5, $com->client->adresse . "\n" . $com->client->cp . " " . $com->client->ville);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -913,7 +913,7 @@ class pdf_einstein extends ModelePDFCommandes
// Nom societe // Nom societe
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11); $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 // Nom client
$carac_client = "\n".$object->contact->getFullName($outputlangs,1); $carac_client = "\n".$object->contact->getFullName($outputlangs,1);