X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=f139ba836465caa053f39ee787d1316b95341c25;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=cc5cafcc814cb16fb05d14ac8c9a6e64bf6a25fc;hpb=f36a75347f4940099744e978acb5f043785a4fea;p=fa-stable.git diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc index cc5cafcc..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,7 +693,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook return ($px / $unit_offset_length); } - function End($email=0, $subject=null, $myrow=null, $doctype = 0) + function End($email=0, $subject='') { global $path_to_root; ++$this->y; @@ -721,4 +721,3 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook } } -?> \ No newline at end of file