Merge pull request #1858 from ndrosis/patch-4

Can change size of Logo picture
This commit is contained in:
Laurent Destailleur 2014-09-02 19:15:59 +02:00
commit 0254edb426

View File

@ -269,7 +269,9 @@ function pdf_getPDFFontSize($outputlangs)
*/ */
function pdf_getHeightForLogo($logo, $url = false) function pdf_getHeightForLogo($logo, $url = false)
{ {
$height=22; $maxwidth=130; global $conf;
$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
$maxwidth=130;
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
$tmp=dol_getImageSize($logo, $url); $tmp=dol_getImageSize($logo, $url);
if ($tmp['height']) if ($tmp['height'])