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

Patch Raphael

Browse Source
This commit is contained in:
Laurent Destailleur 2008-06-17 13:45:44 +00:00
parent 4f1460cb4f
commit b3d7894d9e
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/contact.class.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
* 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
@ -744,9 +745,10 @@ class Contact extends CommonObject
* \brief Return full name (name+' '+lastname) * \brief Return full name (name+' '+lastname)
* \param langs Lang for output * \param langs Lang for output
* \param option 0=No option, 1=Add civility * \param option 0=No option, 1=Add civility
* \param nameorder 0=Lastname+Firstname, 1=Firstname+Lastname
* \return string String with full name * \return string String with full name
*/ */
function getFullName($langs,$option=0) function getFullName($langs,$option=0,$nameorder=0)
{ {
$ret=''; $ret='';
if ($option && $this->civilite_id) if ($option && $this->civilite_id)
@ -754,8 +756,17 @@ class Contact extends CommonObject
if ($langs->transnoentities("Civility".$this->civilite_id)!="Civility".$this->civilite_id) $ret.=$langs->transnoentities("Civility".$this->civilite_id).' '; if ($langs->transnoentities("Civility".$this->civilite_id)!="Civility".$this->civilite_id) $ret.=$langs->transnoentities("Civility".$this->civilite_id).' ';
else $ret.=$this->civilite_id.' '; else $ret.=$this->civilite_id.' ';
} }
if ($nameorder)
{
if ($this->firstname) $ret.=$this->firstname.' ';
if ($this->name) $ret.=$this->name.' ';
}
else
{
if ($this->name) $ret.=$this->name.' '; if ($this->name) $ret.=$this->name.' ';
if ($this->firstname) $ret.=$this->firstname.' '; if ($this->firstname) $ret.=$this->firstname.' ';
}
return trim($ret); return trim($ret);
} }

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

@ -921,9 +921,10 @@ class pdf_einstein extends ModelePDFCommandes
// 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 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"; dol_entity_decode($carac_client.=$object->contact->pays)."\n";
} }
} }
else else
@ -949,10 +950,10 @@ 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 defini et different de l'emetteur //Pays si 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.=dol_entity_decode($object->client->pays)."\n";
} }
} }
// Numéro TVA intracom // Numéro TVA intracom

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

@ -1114,10 +1114,10 @@ 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 //Pays si 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.=dol_entity_decode($object->contact->pays)."\n";
} }
} }
else else
@ -1143,10 +1143,10 @@ 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 defini et different de l'emetteur //Pays si different de l'emetteur
if ( (!empty( $object->client->pays_code )) && ($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.=dol_entity_decode($object->client->pays)."\n";
} }
} }
// Numéro TVA intracom // Numéro TVA intracom

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

@ -947,10 +947,10 @@ 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 //Pays si 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.=dol_entity_decode($object->contact->pays)."\n";
} }
} }
else else
@ -976,10 +976,10 @@ 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 defini et different de l'emetteur //Pays si different de l'emetteur
if ( (!empty( $object->client->pays_code )) && ($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.=dol_entity_decode($object->client->pays)."\n";
} }
} }
// Numéro TVA intracom // Numéro TVA intracom