X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Fpdf_report.inc;h=5b468764fd2ed194af318adf0836b85840307230;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=c475a29be608bdeafbcc8807db72efac9d40190f;hpb=41fc5025878df6a2950e4356e4b6883a5efcac1a;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index c475a29b..5b468764 100644
--- 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
@@ -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');