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 936f7bf1b4
commit 9b68fc591e
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -931,7 +931,7 @@ class pdf_einstein extends ModelePDFCommandes
// Nom client // Nom client
$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 du contact suivi commande si c'est une société // Nom du contact suivi commande si c'est une société
$arrayidcontact = $object->getIdContact('external','CUSTOMER'); $arrayidcontact = $object->getIdContact('external','CUSTOMER');
@ -949,7 +949,7 @@ class pdf_einstein extends ModelePDFCommandes
$carac_client.="\n".$object->client->adresse; $carac_client.="\n".$object->client->adresse;
$carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n"; $carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n";
//Pays si différent de l'émetteur //Pays si defini et different de l'emetteur
if ($this->emetteur->pays_code != $object->client->pays_code) if ($this->emetteur->pays_code != $object->client->pays_code)
{ {
$carac_client.=$object->client->pays."\n"; $carac_client.=$object->client->pays."\n";
@ -958,6 +958,7 @@ class pdf_einstein extends ModelePDFCommandes
// Numéro TVA intracom // Numéro TVA intracom
if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra; if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY(102,$posy+6); $pdf->SetXY(102,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);
} }

10
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -1106,7 +1106,7 @@ class pdf_crabe extends ModelePDFFactures
// 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);
@ -1114,6 +1114,7 @@ class pdf_crabe extends ModelePDFFactures
// Caractéristiques client // Caractéristiques client
$carac_client.="\n".$object->contact->adresse; $carac_client.="\n".$object->contact->adresse;
$carac_client.="\n".$object->contact->cp . " " . $object->contact->ville."\n"; $carac_client.="\n".$object->contact->cp . " " . $object->contact->ville."\n";
//Pays si definit et different de l'emetteur
if ($this->emetteur->pays_code != $object->contact->pays_code) if ($this->emetteur->pays_code != $object->contact->pays_code)
{ {
$carac_client.=$object->contact->pays."\n"; $carac_client.=$object->contact->pays."\n";
@ -1124,7 +1125,7 @@ class pdf_crabe extends ModelePDFFactures
// Nom client // Nom client
$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 du contact facturation si c'est une société // Nom du contact facturation si c'est une société
$arrayidcontact = $object->getIdContact('external','BILLING'); $arrayidcontact = $object->getIdContact('external','BILLING');
@ -1142,8 +1143,8 @@ class pdf_crabe extends ModelePDFFactures
$carac_client.="\n".$object->client->adresse; $carac_client.="\n".$object->client->adresse;
$carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n"; $carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n";
//Pays si différent de l'émetteur //Pays si defini et different de l'emetteur
if ($this->emetteur->pays_code != $object->client->pays_code) if ( (!empty( $object->client->pays_code )) && ($this->emetteur->pays_code != $object->client->pays_code) )
{ {
$carac_client.=$object->client->pays."\n"; $carac_client.=$object->client->pays."\n";
} }
@ -1151,6 +1152,7 @@ class pdf_crabe extends ModelePDFFactures
// Numéro TVA intracom // Numéro TVA intracom
if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra; if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY(102,$posy+6); $pdf->SetXY(102,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);
} }

6
htdocs/includes/modules/facture/pdf_huitre.modules.php
View File

@ -17,8 +17,6 @@
* 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$
*/ */
/** /**
@ -26,7 +24,7 @@
\ingroup facture \ingroup facture
\brief Fichier de la classe permettant de générer les factures au modèle Huitre \brief Fichier de la classe permettant de générer les factures au modèle Huitre
\author Laurent Destailleur \author Laurent Destailleur
\version $Revision$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
@ -607,7 +605,7 @@ class pdf_huitre extends ModelePDFFactures
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $fac->client->nom, 0, 'C'); $pdf->MultiCell(96,5, $fac->client->nom, 0, 'C');
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
$pdf->SetXY(102,50); $pdf->SetXY(102,$pdf->GetY()+3);
$pdf->MultiCell(96,5, $fac->client->adresse . "\n\n" . $fac->client->cp . " " . $fac->client->ville , 0, 'C'); $pdf->MultiCell(96,5, $fac->client->adresse . "\n\n" . $fac->client->cp . " " . $fac->client->ville , 0, 'C');

10
htdocs/includes/modules/fichinter/pdf_soleil.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,15 +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$
*/ */
/** /**
\file htdocs/includes/modules/fichinter/pdf_soleil.modules.php \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php
\ingroup ficheinter \ingroup ficheinter
\brief Fichier de la classe permettant de générer les fiches d'intervention au modèle Soleil \brief Fichier de la classe permettant de générer les fiches d'intervention au modèle Soleil
\version $Revision$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
@ -230,9 +228,9 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',12);
$fichinter->fetch_client(); $fichinter->fetch_client();
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(66,5, $fichinter->client->nom); $pdf->MultiCell(86,5, $fichinter->client->nom);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
$pdf->SetXY(102,47); $pdf->SetXY(102,$pdf->GetY());
$pdf->MultiCell(66,5, $fichinter->client->adresse . "\n" . $fichinter->client->cp . " " . $fichinter->client->ville); $pdf->MultiCell(66,5, $fichinter->client->adresse . "\n" . $fichinter->client->cp . " " . $fichinter->client->ville);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);

10
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -939,7 +939,7 @@ class pdf_propale_azur extends ModelePDFPropales
// 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);
@ -947,6 +947,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Caractéristiques client // Caractéristiques client
$carac_client.="\n".$object->contact->adresse; $carac_client.="\n".$object->contact->adresse;
$carac_client.="\n".$object->contact->cp . " " . $object->contact->ville."\n"; $carac_client.="\n".$object->contact->cp . " " . $object->contact->ville."\n";
//Pays si definit et different de l'emetteur
if ($this->emetteur->pays_code != $object->contact->pays_code) if ($this->emetteur->pays_code != $object->contact->pays_code)
{ {
$carac_client.=$object->contact->pays."\n"; $carac_client.=$object->contact->pays."\n";
@ -957,7 +958,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Nom client // Nom client
$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 du contact suivi propal si c'est une société // Nom du contact suivi propal si c'est une société
$arrayidcontact = $object->getIdContact('external','CUSTOMER'); $arrayidcontact = $object->getIdContact('external','CUSTOMER');
@ -975,8 +976,8 @@ class pdf_propale_azur extends ModelePDFPropales
$carac_client.="\n".$object->client->adresse; $carac_client.="\n".$object->client->adresse;
$carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n"; $carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n";
//Pays si différent de l'émetteur //Pays si defini et different de l'emetteur
if ($this->emetteur->pays_code != $object->client->pays_code) if ( (!empty( $object->client->pays_code )) && ($this->emetteur->pays_code != $object->client->pays_code) )
{ {
$carac_client.=$object->client->pays."\n"; $carac_client.=$object->client->pays."\n";
} }
@ -984,6 +985,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Numéro TVA intracom // Numéro TVA intracom
if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra; if ($object->client->tva_intra) $carac_client.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$object->client->tva_intra;
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);
$posy=$pdf->GetY()-9; //Auto Y coord readjust for multiline name
$pdf->SetXY(102,$posy+6); $pdf->SetXY(102,$posy+6);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);
} }

2
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -348,7 +348,7 @@ class pdf_propale_jaune extends ModelePDFPropales
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $propale->client->nom); $pdf->MultiCell(96,5, $propale->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, $propale->client->adresse . "\n" . $propale->client->cp . " " . $propale->client->ville); $pdf->MultiCell(96,5, $propale->client->adresse . "\n" . $propale->client->cp . " " . $propale->client->ville);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);