projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.4.1
[fa-stable.git]
/
reporting
/
includes
/
excel_report.inc
diff --git
a/reporting/includes/excel_report.inc
b/reporting/includes/excel_report.inc
index 33ac54a529448ee627444c4679e9dd357a41b567..c6f0d4436039b97519644a57e94f08c915baae3d 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"));
@@
-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";
$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->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));
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();
$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)
@@
-197,10
+197,7
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
{
if (!isset($this->formatAmount[$dec]))
{
{
if (!isset($this->formatAmount[$dec]))
{
- //global $thoseps,$decseps;
$dec = (int)$dec;
$dec = (int)$dec;
- //$tsep = $thoseps[user_tho_sep()];
- //$dsep = $decseps[user_dec_sep()];
$tsep = ',';
$dsep = '.';
$format = "###{$tsep}###{$tsep}###{$tsep}##0";
$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)
{
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)
@@
-721,4
+717,3
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
}
}
}
}
-?>
\ No newline at end of file