X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=944b4c28509d38ba5078e93ddbbd7a26e6d57d13;hb=074f5b55ae369597c70953bc7f9324cc491a6a7e;hp=b3fffbe49e66a79bab907ceca3473446623347df;hpb=ca66b9c3c424ca333f62ba11f528b27f392d7145;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index b3fffbe4..944b4c28 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -1,12 +1,20 @@
 <?php
-/* $Revision$ */
-$page_security = 8;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //include_once($path_to_root . "reporting/includes/class.pdf.inc");
 include_once(dirname(__FILE__)."/class.pdf.inc");
 include_once(dirname(__FILE__)."/printer_class.inc");
-include_once($path_to_root . "admin/db/company_db.inc");
-include_once($path_to_root . "admin/db/printers_db.inc");
-include_once($path_to_root . "config.php");
+include_once($path_to_root . "/admin/db/company_db.inc");
+include_once($path_to_root . "/admin/db/printers_db.inc");
+include_once($path_to_root . "/config.php");
 class FrontReport extends Cpdf
 {
 	var $size;
@@ -42,9 +50,16 @@ class FrontReport extends Cpdf
 
 	function FrontReport($title, $filename, $size = 'A4', $fontsize = 9)
 	{
+		global $page_security;
+		if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
+		{
+			display_error(_("The security settings on your account do not permit you to print this report"));
+			end_page();
+			exit;
+		}
 		switch ($size)
 		{
-
+			default:
 		  case 'A4':
 		  case 'a4':
 			  $this->pageWidth=595;
@@ -114,7 +129,7 @@ class FrontReport extends Cpdf
 		}
 		$this->size = array(0, 0, $this->pageWidth, $this->pageHeight);
 		$this->title = $title;
-		$this->filename = $filename;
+		$this->filename = $filename.".pdf";
 		$this->pageNumber = 0;
 		$this->endLine = $this->pageWidth - $this->rightMargin;
 		$this->companyCol = $this->endLine - 150;
@@ -140,7 +155,7 @@ class FrontReport extends Cpdf
 	function Info($params, $cols, $headers, $aligns,
 		$cols2 = null, $headers2 = null, $aligns2 = null)
 	{
-		global $app_title, $version, $power_by, $power_url, $path_to_root,	$db_connections;
+		global $app_title, $version, $power_by, $power_url;
 
 		$this->addinfo('Title', $this->title);
 		$this->addinfo('Subject', $this->title);
@@ -154,7 +169,6 @@ class FrontReport extends Cpdf
 		$this->fiscal_year = sql2date($year['begin']) . " - " . sql2date($year['end']) . "  " . "(" . $how . ")";
 		$this->company = get_company_prefs();
 		$this->user = $_SESSION["wa_current_user"]->name;
-		//$this->host = $db_connections[$_SESSION["wa_current_user"]->company]["host"];
 		$this->host = $_SERVER['SERVER_NAME'];
 		$this->params = $params;
 		$this->cols = $cols;
@@ -195,6 +209,8 @@ class FrontReport extends Cpdf
 		$str = _("Print Out Date") . ':';
 		$this->Text($this->leftMargin, $str, $this->titleCol);
 		$str = Today() . '   ' . Now();
+		if ($this->company['time_zone'])
+			$str .= ' ' . date('O') . ' GMT';
 		$this->Text($this->titleCol, $str, $this->companyCol);
 		$this->Text($this->companyCol, $this->host);
 
@@ -250,22 +266,22 @@ class FrontReport extends Cpdf
 
 	function Header2($myrow, $branch, $sales_order, $bankaccount, $doctype)
 	{
-		global $comp_path, $path_to_root, $print_as_quote, $print_invoice_no;
+		global $comp_path, $path_to_root, $print_as_quote, $print_invoice_no, $packing_slip;
 
 		$this->pageNumber++;
 		if ($this->pageNumber > 1)
 			$this->newPage();
 		$header2type = true;
-		if ($this->currency != $myrow['curr_code'])
+		if (isset($myrow['curr_code']) && $this->currency != $myrow['curr_code'])
 		{
-			include($path_to_root . "reporting/includes/doctext2.inc");
+			include($path_to_root . "/reporting/includes/doctext2.inc");
 		}
 		else
 		{
-			include($path_to_root . "reporting/includes/doctext.inc");
+			include($path_to_root . "/reporting/includes/doctext.inc");
 		}
 
-		include($path_to_root . "reporting/includes/header2.inc");
+		include($path_to_root . "/reporting/includes/header2.inc");
 
 		$this->row = $temp;
 	}
@@ -310,6 +326,18 @@ class FrontReport extends Cpdf
 	{
 		return $this->TextWrap($this->cols[$c], $this->row - $r, $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c]);
 	}
+	
+	function AmountCol($c, $n, $txt, $dec=0, $corr=0, $r=0)
+	{
+		return $this->TextCol($c, $n, number_format2($txt, $dec), $corr, $r);
+	}
+
+	function DateCol($c, $n, $txt, $conv=false, $corr=0, $r=0)
+	{
+		if ($conv)
+			$txt = sql2date($txt);
+		return $this->TextCol($c, $n, $txt, $corr, $r);
+	}
 
 	function TextCol2($c, $n, $txt, $corr=0, $r=0)
 	{
@@ -331,7 +359,7 @@ class FrontReport extends Cpdf
 			do
 			{
 				$l = $this->TextWrap($c, $this->row , $width, $l, $align);
-				$this->NewLine();
+				$this->row -= $this->lineHeight;
 			}
 			while ($l != '');
 		}
@@ -351,7 +379,7 @@ class FrontReport extends Cpdf
 	function NewLine($l=1, $np=0)
 	{
 		$this->row -= ($l * $this->lineHeight);
-		if ($np > 0 && 	$this->row < $this->bottomMargin + ($np * $this->lineHeight))
+		if ($this->row < $this->bottomMargin + ($np * $this->lineHeight))
 			$this->Header();
 	}
 
@@ -361,7 +389,7 @@ class FrontReport extends Cpdf
 
 		if ($pdf_debug == 1)
 		{
-			$pdfcode = $this->Output();
+			$pdfcode = $this->Output('','S');
 			$pdfcode = str_replace("\n", "\n<br>", htmlspecialchars($pdfcode));
 			echo '<html><body>';
 			echo trim($pdfcode);
@@ -377,8 +405,6 @@ class FrontReport extends Cpdf
 		else
 		{
 
-			$buf = $this->Output();
-			$len = strlen($buf);
 			$dir =  $comp_path.'/'.user_company(). '/pdf_files';
 			//save the file
 			if (!file_exists($dir))
@@ -387,10 +413,11 @@ class FrontReport extends Cpdf
 			}
 			// do not use standard filenames or your sensitive company data 
 			// are world readable
-			$fname = $dir.'/'.uniqid('').'.pdf';
-			$fp = fopen($fname,'w');
-			fwrite($fp,$buf);
-			fclose($fp);
+			if ($email == 1)
+				$fname = $dir.'/'.$this->filename;
+			else	
+				$fname = $dir.'/'.uniqid('').'.pdf';
+			$this->Output($fname, 'F');
 			if ($email == 1)
 			{
 				$emailtype = true;
@@ -402,13 +429,14 @@ class FrontReport extends Cpdf
 				{
 					include("doctext.inc");
 				}
-				require_once($path_to_root . "reporting/includes/class.mail.inc");
+				require_once($path_to_root . "/reporting/includes/class.mail.inc");
     			$mail = new email($this->company['coy_name'], $this->company['email']);
-    			$from = $this->company['coy_name'] . " <" . $this->company['email'] . ">";
+				if (!isset($myrow['email']) || $myrow['email'] == '') 
+					$myrow['email'] = isset($myrow['contact_email']) ? $myrow['contact_email'] : '';
     			$to = $myrow['DebtorName'] . " <" . $myrow['email'] . ">";
-    			$msg = $doc_Dear_Sirs . ",\n\n" . $doc_AttachedFile . " " . $subject .
+    			$msg = $doc_Dear_Sirs . " " . $myrow['DebtorName'] . ",\n\n" . $doc_AttachedFile . " " . $subject .
     				"\n\n";
-				if ($myrow['dimension_id'] > 0 && $doctype == 10) // helper for payment links
+				if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == 10) // helper for payment links
 				{
 					if ($myrow['dimension_id'] == 1)
 					{
@@ -421,33 +449,18 @@ class FrontReport extends Cpdf
 					}
 				}
     			$msg .= $doc_Kindest_regards . "\n\n";
-    			$sender = $this->user . "\n" . $this->company['coy_name'];
+    			$sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
     			$mail->to($to);
     			$mail->subject($subject);
     			$mail->text($msg . $sender);
     			$mail->attachment($fname);
     			$ret = $mail->send();
-    			if (1 == 1) // just for fun and for debugging purposes!!
-    			{
-    				$from = str_replace("<", "(", $from);
-    				$from = str_replace(">", ")", $from);
-    				$to = str_replace("<", "(", $to);
-    				$to = str_replace(">", ")", $to);
-    				$msg2 = "<br>From: " . $from;
-    				$msg2 .= "<br>To: " . $to;
-    				$msg2 .= "<br>Subject: " . $subject;
-    				$msg2 .= "<br>Msg: " . nl2br($msg);
-    				$msg2 .= nl2br($sender) . "<br>";
-    				$msg2 .= "<br>Filepath: " . $fname . "<br>Filename: " . $this->filename . "<br>";
-    			}
-    			if ($ret)
-    				$str = "<br>" . $this->title . " " . $myrow['reference'] . " " . _("sent to") . " ";
-    			else
-    				$str = "<br>" . $this->title . " " . $myrow['reference'] . " " . _("NOT sent to") . " ";
-    			$msg2 .= $str . $myrow['DebtorName'] . " - " . $myrow['email'];
-    			echo "<html><body>";
-    			echo $msg2;
-    			echo "</body></html>";
+				if (!$ret)
+					display_error(_("Sending document by email failed"));
+				else
+					display_notification($this->title . " " . $myrow['reference'] . " " 
+						. _("has been sent by email."));
+				unlink($fname);		
 			}
 			else
 			{
@@ -476,6 +489,7 @@ class FrontReport extends Cpdf
         	        header('Expires: 0');
             	    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
                 	header('Pragma: public');
+
 	                $this->Stream();
 					}
 				} else { // send report to network printer