diff --git a/ChangeLog b/ChangeLog index 2d398c83535..1ce34b5e87a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,7 @@ Following changes may create regressions for some external modules, but were nec * Removed function dol_micro_time. Use native PHP microtime instead. * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE. * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS. -* If your logo was visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible agin in menu. +* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. * All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. * All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. * All properties 'type_libelle' were renamed into 'type_label'. diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 918b5ebb6a3..619a9c7d488 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -416,6 +416,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra); } // Professionnal Ids + $reg = array(); if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1)) { $tmp=$outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code); @@ -452,6 +453,9 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp=$reg[1]; $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6); } + if (! empty($conf->global->PDF_ADD_MORE_AFTER_ADDRESS)) { + $stringaddress.=($stringaddress ? "\n" : '' ).$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS; + } } if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))