X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=f139ba836465caa053f39ee787d1316b95341c25;hb=7561718ee5113232ce917f63085d272884b0929c;hp=01872157cf3654cb447f89d7bea23befac947dc0;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 01872157..f139ba83 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"));
@@ -99,7 +100,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)
@@ -225,7 +226,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)
@@ -693,13 +693,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
   		return ($px / $unit_offset_length);
   	}	
 
-	function recalculate_cols(&$cols)
-	{
-		$factor = (user_pagesize() == "A4" ? 1.4 : 1.3);
-		foreach($cols as $key => $col)
-			$cols[$key] = intval($col * $factor); 
-	}
-
 	function End($email=0, $subject='')
 	{
 		global $path_to_root;
@@ -728,4 +721,3 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	}
 }
 
-?>
\ No newline at end of file