X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=ecb31b0e46a5c3620bf1d3b2b08a9600f75d6f68;hb=2ce280fb8619210f21485b723ec4cb2b306fcce9;hp=b41bb69e867d8b4c2831dbe509868f6ef95da468;hpb=1bded8f2ef7c8c5b88bf5a6347802712a31e01e3;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index b41bb69e..ecb31b0e 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -24,6 +24,7 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
 include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/admin/db/printers_db.inc");
+include_once($path_to_root . "/includes/ui/ui_globals.inc");
 include_once($path_to_root . "/config.php");
 
 class FrontReport extends Cpdf
@@ -341,7 +342,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'] != '')
 			{
@@ -371,12 +372,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();
@@ -389,7 +390,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', 
@@ -742,7 +743,7 @@ class FrontReport extends Cpdf
 
 	function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 1, $spacebreak=false)
 	{
-		$str = strtr($str, array("\r"=>''));
+		$str = ($str != NULL ? strtr($str, array("\r"=>'')) : "");
 
 		if ($this->fontSize != $this->oldFontSize)
 		{
@@ -772,7 +773,7 @@ class FrontReport extends Cpdf
 		setlocale(LC_MONETARY, $amount_locale);
 		if ($color_red && $txt < 0)
 			$this->SetTextColor(255, 0, 0);
-		$ret = $this->TextCol($c, $n, money_format($amount_format, $txt), $corr, $r, $border, $fill, $link, $stretch);
+		$ret = $this->TextCol($c, $n, price_format($txt), $corr, $r, $border, $fill, $link, $stretch);
 		if ($color_red && $txt < 0)
 			$this->SetTextColor(0, 0, 0);
 		return $ret;	
@@ -798,7 +799,7 @@ class FrontReport extends Cpdf
 
 	function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0, $spacebreak=true)
 	{
-		$str = explode("\n", $txt);
+		$str = ($txt != NULL ? explode("\n", $txt) : array());
 
 		for ($i = 0; $i < count($str); $i++)
 		{
@@ -952,6 +953,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');