X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=c6f0d4436039b97519644a57e94f08c915baae3d;hb=615c63fbc4aea4d0e136e868993e71190aacadd2;hp=33ac54a529448ee627444c4679e9dd357a41b567;hpb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;p=fa-stable.git

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 33ac54a5..c6f0d443 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -61,7 +61,8 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
 	function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
 	{
-		global $dateseps, $page_security;
+		global $SysPrefs, $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"));
@@ -80,10 +81,9 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 		$rtl = ($_SESSION['language']->dir == 'rtl');
 		$this->code = strtolower($_SESSION['language']->encoding);
 		$this->filename = $filename.".xls";
-		$this->unique_name = uniqid('').".xls";
+		$this->unique_name = random_id().".xls";
 		$this->path = company_path(). '/pdf_files';
 		$this->Spreadsheet_Excel_Writer_Workbook($this->path."/".$this->unique_name);
-		//$this->setCountry(48);
 		if ($this->code != "iso-8859-1")
 			$this->setVersion(8); // set biff version to 8 (0x0006 internal)
 		$this->sheet =& $this->addWorksheet($this->worksheetNameGenerator($this->title));
@@ -99,7 +99,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 		$this->formatTitle->setTopColor('gray');
 
 		$how = user_date_format();
-		$sep = $dateseps[user_date_sep()];
+		$sep = $SysPrefs->dateseps[user_date_sep()];
 		if ($sep == '.')
 			$sep = "\\.";
 		if ($how == 0)
@@ -197,10 +197,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	{
 		if (!isset($this->formatAmount[$dec]))
 		{
-			//global $thoseps,$decseps;
 			$dec = (int)$dec;
-			//$tsep = $thoseps[user_tho_sep()];
-			//$dsep = $decseps[user_dec_sep()];
 			$tsep = ',';
 			$dsep = '.';
 			$format = "###{$tsep}###{$tsep}###{$tsep}##0";
@@ -225,7 +222,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	function Info($params, $cols, $headers, $aligns,
 		$cols2 = null, $headers2 = null, $aligns2 = null)
 	{
-		global $app_title, $version, $power_by, $power_url;
 		$this->company = get_company_prefs();
 		$year = get_current_fiscalyear();
 		if ($year['closed'] == 0)
@@ -721,4 +717,3 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	}
 }
 
-?>
\ No newline at end of file