X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=31dcdb367bc1eb584df1d8369e53eceabcb5c5a8;hb=004760666ed0828f177b6055f91cf6f6ce905be2;hp=c8bd32550b1204d028fdf0305cf1ff34b2af6c35;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index c8bd3255..31dcdb36 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);
 	}
 	
 	/*
@@ -296,6 +296,8 @@ class FrontReport extends Cpdf
 	//
 	function Header()
 	{
+		global $SysPrefs;
+		
 		$companyCol = $this->endLine - 150;
 		$titleCol = $this->leftMargin + 100;
 
@@ -311,9 +313,18 @@ class FrontReport extends Cpdf
 		$this->Text($this->leftMargin, $this->title, $companyCol);
 		$this->Font();
 		$this->fontSize -= 4;
-		$this->Text($companyCol, $this->company['coy_name']);
-		$this->row -= ($this->lineHeight + 4);
-
+		$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);
+			$this->row -= 6;
+		}
+		else
+		{
+			$this->Text($companyCol, $this->company['coy_name']);
+			$this->row -= ($this->lineHeight + 4);
+		}
 		$str = _("Print Out Date") . ':';
 		$this->Text($this->leftMargin, $str, $titleCol);
 		$str = Today() . '   ' . Now();
@@ -376,8 +387,6 @@ class FrontReport extends Cpdf
 	*/
 	function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
 	{
-//		$this->formData = array_merge($myrow, $branch, $sales_order, 
-//			$bank_account, array('doctype' => $doctype));
 
 		$this->formData = array();
 		$datnames = array( 
@@ -471,16 +480,6 @@ class FrontReport extends Cpdf
 		$footerCol = $this->leftMargin + PAGE_NUM_WIDTH; 
 		$footerRow = $this->bottomMargin - FOOTER_MARGIN;
 
-		// Calling this function generates a new PDF page after the first instance
-//		{
-//			// TODO: experimenting with line drawing to highlight current period
-//			$this->SetLineWidth(1);
-//			$this->LineTo($this->cols[3], 33, $this->cols[3], 534);
-//			$this->LineTo($this->cols[4], 33, $this->cols[4], 534);
-//			$this->SetLineWidth(0.1);
-			
-//			$this->newPage();
-//		}
 		$this->row = $this->pageHeight - $this->topMargin;
 
 		// Set the color of dividing lines we'll draw
@@ -969,10 +968,7 @@ class FrontReport extends Cpdf
 			}
 			// do not use standard filenames or your sensitive company data 
 			// are world readable
-			if ($email == 1)
-				$fname = $dir.'/'.$this->filename;
-			else	
-				$fname = $dir.'/'.uniqid('').'.pdf';
+			$fname = $dir.'/'.random_id().'.pdf';
 			$this->Output($fname, 'F');
 
 			if ($email == 1)
@@ -1026,7 +1022,7 @@ class FrontReport extends Cpdf
     					$mail->to($to); $try++;
     					$mail->subject($subject);
     					$mail->text($msg . $sender);
-    					$mail->attachment($fname);
+    					$mail->attachment($fname, $this->filename);
     					$emails .= " " . $contact['email'];
     					if ($mail->send()) $sent++;
 					} // foreach contact
@@ -1059,7 +1055,6 @@ class FrontReport extends Cpdf
 						header('Expires: 0');
 						header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 						header('Pragma: public');
-//						$this->Stream(basename($fname));
 						$this->Stream($this->filename);
 					}
 				} else { // send report to network printer