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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index b3fffbe4..8c5d5727 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -1,12 +1,22 @@
 <?php
+/**********************************************************************
+    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>.
+***********************************************************************/
 /* $Revision$ */
 $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");
-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;
@@ -114,7 +124,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 +150,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 +164,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;
@@ -258,14 +267,14 @@ class FrontReport extends Cpdf
 		$header2type = true;
 		if ($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 +319,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)
 	{
@@ -351,7 +372,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 +382,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 +398,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))
@@ -388,9 +407,7 @@ 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);
+			$this->Output($fname, 'F');
 			if ($email == 1)
 			{
 				$emailtype = true;