[0005214] Stock Check Sheet: changed option name to less confusing for shortages...

[fa-stable.git] / reporting / includes / excel_report.inc

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 3786a91aaf9d92bcba4522a2096473deac9dc390..1ee91c703076d348a48c0b99ba502bb0fbd45898 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -60,7 +60,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
        
        var $sheet;
 
-       function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
+       function __construct($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
        {
                global $SysPrefs, $page_security;
 
@@ -84,7 +84,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $this->filename = $filename.".xls";
                $this->unique_name = random_id().".xls";
                $this->path = company_path(). '/pdf_files';
-               $this->Spreadsheet_Excel_Writer_Workbook($this->path."/".$this->unique_name);
+               parent::__construct($this->path."/".$this->unique_name);
                if ($this->code != "iso-8859-1")
                        $this->setVersion(8); // set biff version to 8 (0x0006 internal)
                $this->sheet = $this->addWorksheet($this->worksheetNameGenerator($this->title));
@@ -240,7 +240,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $this->headers2 = $headers2;
                $this->aligns2 = $aligns2;
                $this->numcols = count($this->headers);
-               $tcols = count($this->headers2);
+               $tcols = count_array($this->headers2);
                if ($tcols > $this->numcols)
                        $this->numcols = $tcols;
                for ($i = 0; $i < $this->numcols; $i++)