X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=da26d5592c408dc7c795a103d90999e696366613;hb=9561c66909d960cd75bcbb08bae2132f3de7e6da;hp=3786a91aaf9d92bcba4522a2096473deac9dc390;hpb=366a3ecbcd7841413f980f9e1d65895b77af1b82;p=fa-stable.git

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 3786a91a..da26d559 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -56,11 +56,17 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	var $formatHeaderRight;
 	var $formatFooter;
 	var $formatAmount = array();
+	var $formatRight;
+	var $formatLeft;
+	var $formatTopHeaderLeft;
+	var $formatBottomHeaderLeft;
+	var $formatTopHeaderRight;
+	var $formatBottomHeaderRight;
 	var $headerFunc;
 	
 	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 +90,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 +246,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++)