From 42e47fd567d70d94c2c42826d5e1b4d44ceda284 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 6 Jun 2010 15:11:46 +0000 Subject: [PATCH] New: Support "Department/State" field on contact card. --- htdocs/lib/pdf.lib.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 427940b4c92..f5a6822f819 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -67,14 +67,24 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1,1)); // Recipient properties $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address); - $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville)."\n"; + $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville); + if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US'))) + { + $stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement); + } + $stringaddress.="\n"; if ($targetcontact->pays_code && $targetcontact->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->pays_code))."\n"; } else { // Recipient properties $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address); - $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville)."\n"; + $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville); + if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US'))) + { + $stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement); + } + $stringaddress.="\n"; if ($targetcompany->pays_code && $targetcompany->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->pays_code))."\n"; } // Intra VAT