X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=67d23e84cbdca7ce6792646925b5ff888f1ceb96;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=10348cfea712b20e2f1d783ec5f90e3fba146b88;hpb=b42adf7edd906956a0f9cf21c0ec2b66007b9585;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 10348cfe..67d23e84 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 8;
 //include_once($path_to_root . "reporting/includes/class.pdf.inc");
 include_once(dirname(__FILE__)."/class.pdf.inc");
 include_once(dirname(__FILE__)."/printer_class.inc");
@@ -54,7 +53,7 @@ class FrontReport extends Cpdf
 		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 access this function"));
+			display_error(_("The security settings on your account do not permit you to print this report"));
 			end_page();
 			exit;
 		}
@@ -267,7 +266,7 @@ 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)
@@ -414,7 +413,10 @@ class FrontReport extends Cpdf
 			}
 			// do not use standard filenames or your sensitive company data 
 			// are world readable
-			$fname = $dir.'/'.uniqid('').'.pdf';
+			if ($email == 1)
+				$fname = $dir.'/'.$this->filename;
+			else	
+				$fname = $dir.'/'.uniqid('').'.pdf';
 			$this->Output($fname, 'F');
 			if ($email == 1)
 			{
@@ -429,12 +431,12 @@ class FrontReport extends Cpdf
 				}
 				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 ($myrow['email'] == '') $myrow['email'] = $myrow['contact_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 . " " . $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)
 					{
@@ -453,24 +455,12 @@ class FrontReport extends Cpdf
     			$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)
 					display_error(_("Sending document by email failed"));
 				else
 					display_notification($this->title . " " . $myrow['reference'] . " " 
 						. _("has been sent by email."));
+				unlink($fname);		
 			}
 			else
 			{