projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional access control related ui helpers added: check_edit_access, access_post...
[fa-stable.git]
/
reporting
/
includes
/
excel_report.inc
diff --git
a/reporting/includes/excel_report.inc
b/reporting/includes/excel_report.inc
index 01872157cf3654cb447f89d7bea23befac947dc0..f139ba836465caa053f39ee787d1316b95341c25 100644
(file)
--- 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)
{
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"));
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();
$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)
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)
{
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)
$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);
}
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;
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