[0005209] Reports: fixed broken reports after session timeout.

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index c475a29be608bdeafbcc8807db72efac9d40190f..a0a78be95b0784c49531c477a4603374c4164fb9 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);
        }
        
        /*
@@ -314,10 +314,12 @@ class FrontReport extends Cpdf
                $this->Font();
                $this->fontSize -= 4;
                $logo = company_path() . "/images/" . $this->company['coy_logo'];
-               if (!empty($SysPrefs->show_company_logo_report) && $this->company['coy_logo'] != '' && file_exists($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
@@ -339,7 +341,7 @@ class FrontReport extends Cpdf
                $str = $this->fiscal_year;
                $this->Text($titleCol, $str, $companyCol);
                $this->Text($companyCol, $this->user);
-               for ($i = 1; $i < count($this->params); $i++)
+               for ($i = 1; $i < count_array($this->params); $i++)
                {
                        if ($this->params[$i]['from'] != '')
                        {
@@ -369,12 +371,12 @@ class FrontReport extends Cpdf
                $this->Font('italic');
                if ($this->headers2 != null)
                {
-                       $count = count($this->headers2);
+                       $count = count_array($this->headers2);
                        for ($i = 0; $i < $count; $i++)
                                $this->TextCol2($i, $i + 1,     $this->headers2[$i]);
                        $this->NewLine();
                }
-               $count = count($this->headers);
+               $count = count_array($this->headers);
                for ($i = 0; $i < $count; $i++)
                        $this->TextCol($i, $i + 1, $this->headers[$i]);
                $this->Font();
@@ -387,7 +389,7 @@ class FrontReport extends Cpdf
        */
        function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
        {
-
+               $this->pageNumber = 0;
                $this->formData = array();
                $datnames = array( 
                'myrow' => array('ord_date', 'date_', 'tran_date', 
@@ -950,6 +952,9 @@ class FrontReport extends Cpdf
        {
                global $SysPrefs, $path_to_root;
 
+               if (!empty($SysPrefs->prefs['print_dialog_direct']))            
+                       $this->includeJS("print();"); // force to open print dialog
+
                if ($SysPrefs->pdf_debug == 1)
                {
                        $pdfcode = $this->Output('','S');