From 2c632b8bf9697403451df2ba4c4a491a9379cf91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Mar 2012 03:18:27 +0200 Subject: [PATCH] Fix: Support companies with no prof id. --- htdocs/lib/pdf.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 073f6f50a08..828e0e54b18 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -208,25 +208,25 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra); // Professionnal Ids - if ($conf->global->MAIN_PROFID1_IN_ADDRESS) + if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1)) { $tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->pays_code); if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1]; $stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1); } - if ($conf->global->MAIN_PROFID2_IN_ADDRESS) + if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2)) { $tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->pays_code); if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1]; $stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2); } - if ($conf->global->MAIN_PROFID3_IN_ADDRESS) + if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3)) { $tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->pays_code); if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1]; $stringaddress.="\n".$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3); } - if ($conf->global->MAIN_PROFID4_IN_ADDRESS) + if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4)) { $tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->pays_code); if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];