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

Merge remote-tracking branch 'origin/3.9' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-25 01:42:03 +01:00
commit 1ba2407da4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/lib/pdf.lib.php
View File

@ -340,22 +340,21 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
/**
* Returns the name of the thirdparty
*
* @param Societe|Contact $thirdparty Contact or thirdparty
* @param Translate $outputlangs Output language
* @param Societe|Contact $thirdparty Contact or thirdparty
* @param Translate $outputlangs Output language
* @param int $includealias 1=Include alias name after name
* @return string
*/
function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs)
function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias=0)
{
//Recipient name
// Recipient name
$socname = '';
// On peut utiliser le nom de la societe du contact
if ($thirdparty instanceof Societe) {
if (!empty($thirdparty->name_alias)) {
$socname = $thirdparty->name_alias."\n";
}
$socname .= $thirdparty->name;
if ($includealias && !empty($thirdparty->name_alias)) {
$socname .= "\n".$thirdparty->name_alias;
}
} elseif ($thirdparty instanceof Contact) {
$socname = $thirdparty->socname;
} else {