From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 20 Dec 2009 23:36:54 +0000 (+0000)
Subject: Function money_format function doesn't exist in OS Win. Fix in current_user.inc
X-Git-Tag: 2.3-final~1082
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=c2ab31ecc8bd6c3be0dc3b3d64dee508e982b998;p=fa-stable.git

Function money_format function doesn't exist in OS Win. Fix in current_user.inc
Some errors in header3() in pdf_report.inc..
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ff354099..49d6b095 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Dec-2009 Joe Hunt
+# Function money_format function doesn't exist in OS Win. Fix in current_user.inc
+  Some errors in header3() in pdf_report.inc..
+$ /includes/current_user.inc
+  /reporting/includes/pdf_report.inc
+
 18-Dec-2009 Joe Hunt
 # Allowing a quantity of 0 in a PO item line when modifying caused strange result.
   Fixed depending on the decimals in the stock item to not allow less than minimum.
diff --git a/includes/current_user.inc b/includes/current_user.inc
index e9125bcd..023da535 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -239,6 +239,15 @@ function price_decimal_format($number, &$dec)
 	}
 	return number_format2($number, $dec);
 }
+// function money_format doesn't exist in OS Win.
+if (!function_exists('money_format'))
+{
+	function money_format($format, $number) 
+	{
+		return price_format($number);
+	} 
+}	
+
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
 function qty_format($number, $stock_id=null, &$dec) {
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 2e1654d1..c5ce8ba3 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -523,7 +523,7 @@ class FrontReport extends Cpdf
 		$str = _("Report Period") . ':';
 		$this->Text($this->leftMargin, $str, $headerFieldCol);
 		$str = '';
-		if ($this->params[1]['from'] != '')
+		if (isset($this->params[1]['from']) && $this->params[1]['from'] != '')
 			$str = $this->params[1]['from'] . ' - ';
 		$str .= $this->params[1]['to'];
 		$this->Text($headerFieldCol, $str, $companyCol);