[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

[fa-stable.git] / reporting / includes / pdf_report.inc

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 65aaaf9e89b690750ca60d5eb2998ea591cfa31d..b41bb69e867d8b4c2831dbe509868f6ef95da468 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -70,7 +70,7 @@ class FrontReport extends Cpdf
        
        var $dest;      // destination: email or printer
        
-       function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = NULL)
+       function __construct($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = NULL)
        {
                global $page_security;
 
@@ -222,7 +222,7 @@ class FrontReport extends Cpdf
                $this->scaleLogoWidth = false; // if Logo, scale on width (else height).
                $this->SetHeaderType('Header'); // default
 
-               $this->Cpdf($size, $_SESSION['language']->code, $orientation);
+               parent::__construct($size, $_SESSION['language']->code, $orientation);
        }
        
        /*
@@ -316,8 +316,10 @@ class FrontReport extends Cpdf
                $logo = company_path() . "/images/" . $this->company['coy_logo'];
                if (!empty($SysPrefs->prefs['company_logo_report']) && $this->company['coy_logo'] != '' && file_exists($logo))
                {
-                       $this->row -= ($this->lineHeight + 3);
-                       $this->AddImage($logo, $companyCol, $this->row, 0, 30);
+                       $size = getimagesize($logo);
+                       $height = $size[0] > 150 ? $size[1] * 150 / $size[0] : 30; 
+                       $this->row -= ($height / 2);
+                       $this->AddImage($logo, $companyCol, $this->row, 0, $height);
                        $this->row -= 6;
                }
                else