Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
5356cd9b93
1 changed files with 7 additions and 1 deletions
|
|
@ -622,12 +622,18 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
|
|||
if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || preg_match('/targetwithdetails/', $mode)) {
|
||||
// Phone
|
||||
if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
|
||||
if (!empty($targetcompany->phone)) {
|
||||
if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) {
|
||||
$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
|
||||
}
|
||||
if (!empty($targetcompany->phone)) {
|
||||
$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
|
||||
}
|
||||
if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) {
|
||||
$stringaddress .= " / ";
|
||||
}
|
||||
if (!empty($targetcompany->phone_mobile)) {
|
||||
$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
|
||||
}
|
||||
}
|
||||
// Fax
|
||||
if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue