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

Fix use of details in pdf foot

Browse Source
This commit is contained in:
Maxime Kohlhaas 2016-04-23 17:10:56 +02:00
parent 5bfc65676c
commit 0358db0065
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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