X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=a0a78be95b0784c49531c477a4603374c4164fb9;hb=e685a94465fe8f26c8ff3789242b43c1c20054cf;hp=31dcdb367bc1eb584df1d8369e53eceabcb5c5a8;hpb=19ddc3939071044c8e94b628f1d6a039f50cc493;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 31dcdb36..a0a78be9 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -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
@@ -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');