diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 6e4c77fe1d2..252b51be7d2 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -803,7 +803,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass // First line of company infos $line1=""; $line2=""; $line3=""; $line4=""; - if ($showdetails) + if ($showdetails == 1 || $showdetails == 3) { // Company name if ($fromcompany->name) @@ -813,7 +813,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass // Address if ($fromcompany->address) { - $line1.=($line1?" - ":"").$fromcompany->address; + $line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address); } // Zip code if ($fromcompany->zip) @@ -828,12 +828,12 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass // Phone if ($fromcompany->phone) { - $line1.=($line1?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone; + $line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone; } // Fax if ($fromcompany->fax) { - $line1.=($line1?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax; + $line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax; } // URL @@ -847,7 +847,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass $line2.=($line2?" - ":"").$fromcompany->email; } } - if ($showdetails || ($fromcompany->country_code == 'DE')) + if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE')) { // Managers if ($fromcompany->managers)