X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=483d0fde157170d2d66fd99dc390d856908f6a83;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=9b8ed81b172531486a89102749a17b28abd5dc2e;hpb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;p=fa-stable.git

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 9b8ed81b..483d0fde 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -9,13 +9,13 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-/* $Revision$ */
-$page_security = 8;
 include_once($path_to_root . "/reporting/includes/Workbook.php");
 include_once($path_to_root . "/admin/db/company_db.inc");
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/config.php");
-
-class FrontReport extends Workbook
+define('MAX_ROW_SHEET', 65530);
+// xls version
+class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 {
 	var $size;
 	var $company;
@@ -26,11 +26,12 @@ class FrontReport extends Workbook
 	var $filename;
 	var $unique_name;
 	var $path;
-	var $rtl;
 	var $code;
 	var $bottomMargin = 0;
 	var $lineHeight;
 	var $leftMargin = 0;
+	var $pageWidth;		// dummy
+	var $rightMargin;	// dummy
 
 	var $cols;
 	var $params;
@@ -45,7 +46,9 @@ class FrontReport extends Workbook
 	var $row = 9999999;
 	var $y;
 	var $numcols;
-	
+	var $excelColWidthFactor;
+	var $endLine;
+
 	var $formatTitle;
 	var $formatDateTime;
 	var $formatDate;
@@ -53,38 +56,51 @@ class FrontReport extends Workbook
 	var $formatHeaderRight;
 	var $formatFooter;
 	var $formatAmount = array();
+	var $headerFunc;
 	
 	var $sheet;
 
-	function FrontReport($title, $filename, $size = 'A4', $fontsize = 9)
+	function __construct($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = 6.5)
 	{
-		global $comp_path, $dateseps;
-		
+		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"));
+			end_page();
+			exit;
+		}
 		$this->size = $size;
 		$this->title = $title;
 		$this->lineHeight = 12;
-		$this->fontSize = $fontsize;
+		$this->endLine = 760;
+		$this->SetFontSize($fontsize);
 		$this->oldFontSize = 0;
-		$this->y = 1;
+		$this->y = 0;
 		$this->currency = '';
-		$this->rtl = ($_SESSION['language']->dir === 'rtl' ? 'rtl' : 'ltr');
-		$this->code = $_SESSION['language']->encoding;
+		$this->excelColWidthFactor = $excelColWidthFactor;
+		$rtl = ($_SESSION['language']->dir == 'rtl');
+		$this->code = strtolower($_SESSION['language']->encoding);
 		$this->filename = $filename.".xls";
-		$this->unique_name = uniqid('').".xls";
-		$this->path = $comp_path.'/'.user_company(). '/pdf_files';
-		$this->Workbook($this->path."/".$this->unique_name);
-		
-		$this->sheet =& $this->add_worksheet($this->title);
-		if ($this->rtl === 'rtl')
-			$this->sheet->set_rtl();
-		$this->formatTitle =& $this->add_format();	
-		$this->formatTitle->set_size(16);
-		$this->formatTitle->set_bold();
-		$this->formatTitle->set_top(2);
-		$this->formatTitle->set_top_color('gray');
-	
+		$this->unique_name = random_id().".xls";
+		$this->path = company_path(). '/pdf_files';
+		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));
+		if ($this->code != "iso-8859-1")
+			$this->sheet->setInputEncoding($this->code); // set sheet encoding
+		if ($rtl)
+			$this->sheet->setRTL();
+		$this->formatTitle =& $this->addFormat();	
+		$this->formatTitle->setSize(16);
+		$this->formatTitle->setBold();
+		$this->formatTitle->setAlign($rtl ? 'right' : 'left');
+		$this->formatTitle->setTop(2);
+		$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)
@@ -102,67 +118,112 @@ class FrontReport extends Workbook
 			$dateformat_long = "yyyy{$sep}mm{$sep}dd\ \ hh:mm";
 			$dateformat = "yyyy{$sep}mm{$sep}dd";
 		}	
-		$this->formatDateTime =& $this->add_format();
-		$this->formatDateTime->set_num_format($dateformat_long);
-		$this->formatDateTime->set_align('left');
-		$this->formatDate =& $this->add_format();
-		$this->formatDate->set_num_format($dateformat);
-		$this->formatDate->set_align('left');
-		$this->formatRight =& $this->add_format();
-		$this->formatRight->set_align('right');
+		$this->formatDateTime =& $this->addFormat();
+		$this->formatDateTime->setNumFormat($dateformat_long);
+		$this->formatDateTime->setAlign($rtl ? 'right' : 'left');
+		$this->formatDate =& $this->addFormat();
+		$this->formatDate->setNumFormat($dateformat);
+		$this->formatDate->setAlign($rtl ? 'right' : 'left');
+		$this->formatRight =& $this->addFormat();
+		$this->formatRight->setAlign($rtl ? 'left' : 'right');
+		$this->formatLeft =& $this->addFormat();
+		$this->formatLeft->setAlign($rtl ? 'right' : 'left');
 		
-		$this->formatHeaderLeft =& $this->add_format();
-		$this->formatHeaderLeft->set_italic();
-		$this->formatHeaderLeft->set_top(2);
-		$this->formatHeaderLeft->set_top_color('gray');
-		$this->formatHeaderLeft->set_bottom(2);
-		$this->formatHeaderLeft->set_bottom_color('gray');
-		$this->formatHeaderLeft->set_align('vcenter');
-		$this->formatHeaderLeft->set_align('left');
-		$this->formatHeaderRight =& $this->add_format();
-		$this->formatHeaderRight->set_italic();
-		$this->formatHeaderRight->set_top(2);
-		$this->formatHeaderRight->set_top_color('gray');
-		$this->formatHeaderRight->set_bottom(2);
-		$this->formatHeaderRight->set_bottom_color('gray');
-		$this->formatHeaderRight->set_align('vcenter');
-		$this->formatHeaderRight->set_align('right');
-		$this->formatFooter =& $this->add_format();
-		$this->formatFooter->set_top(2);
-		$this->formatFooter->set_top_color('gray');
+		$this->formatHeaderLeft =& $this->addFormat();
+		$this->formatHeaderLeft->setItalic();
+		$this->formatHeaderLeft->setTop(2);
+		$this->formatHeaderLeft->setTopColor('gray');
+		$this->formatHeaderLeft->setBottom(2);
+		$this->formatHeaderLeft->setBottomColor('gray');
+		$this->formatHeaderLeft->setAlign('vcenter');
+		$this->formatTopHeaderLeft =& $this->addFormat();
+		$this->formatTopHeaderLeft->setItalic();
+		$this->formatTopHeaderLeft->setTop(2);
+		$this->formatTopHeaderLeft->setTopColor('gray');
+		$this->formatTopHeaderLeft->setAlign('vcenter');
+		$this->formatBottomHeaderLeft =& $this->addFormat();
+		$this->formatBottomHeaderLeft->setItalic();
+		$this->formatBottomHeaderLeft->setBottom(2);
+		$this->formatBottomHeaderLeft->setBottomColor('gray');
+		$this->formatBottomHeaderLeft->setAlign('vcenter');
+		$this->formatDate->setAlign($rtl ? 'right' : 'left');
+		$this->formatHeaderRight =& $this->addFormat();
+		$this->formatHeaderRight->setItalic();
+		$this->formatHeaderRight->setTop(2);
+		$this->formatHeaderRight->setTopColor('gray');
+		$this->formatHeaderRight->setBottom(2);
+		$this->formatHeaderRight->setBottomColor('gray');
+		$this->formatHeaderRight->setAlign('vcenter');
+		$this->formatHeaderRight->setAlign('right');
+		$this->formatTopHeaderRight =& $this->addFormat();
+		$this->formatTopHeaderRight->setItalic();
+		$this->formatTopHeaderRight->setTop(2);
+		$this->formatTopHeaderRight->setTopColor('gray');
+		$this->formatTopHeaderRight->setAlign('vcenter');
+		$this->formatTopHeaderRight->setAlign('right');
+		$this->formatBottomHeaderRight =& $this->addFormat();
+		$this->formatBottomHeaderRight->setItalic();
+		$this->formatBottomHeaderRight->setBottom(2);
+		$this->formatBottomHeaderRight->setBottomColor('gray');
+		$this->formatBottomHeaderRight->setAlign('vcenter');
+		$this->formatBottomHeaderRight->setAlign('right');
+		$this->formatFooter =& $this->addFormat();
+		$this->formatFooter->setTop(2);
+		$this->formatFooter->setTopColor('gray');
+		$this->SetHeaderType("header");
 	}
 	
+
+	/*
+		Set header handler
+	*/
+	function SetHeaderType($name) {
+		$this->headerFunc = $name;
+	}
+	// Check a given name to see if it's a valid Excel worksheet name,
+	// and fix if necessary
+	function worksheetNameGenerator($name)
+	{
+		// First, strip out characters which aren't allowed
+		$illegal_chars = array(':', '\\', '/', '?', '*', '[', ']');
+		for ($i = 0; $i < count($illegal_chars); $i++)
+			$name = str_replace($illegal_chars[$i], '', $name);
+		// Now, if name is longer than 31 chars, truncate it
+		if (strlen($name) > 31)
+			$name = substr($name, 0, 31);
+		return $name;
+	}
+ 	
 	function NumFormat($dec) 
 	{
 		if (!isset($this->formatAmount[$dec]))
 		{
-			global $thoseps,$decseps;
 			$dec = (int)$dec;
-			$tsep = $thoseps[user_tho_sep()];
-			$dsep = $decseps[user_dec_sep()];
+			$tsep = ',';
+			$dsep = '.';
 			$format = "###{$tsep}###{$tsep}###{$tsep}##0";
 			if ($dec>0)
 				$format .= "{$dsep}".str_repeat('0',$dec);
-			$this->formatAmount[$dec] =& $this->add_format();
-			$this->formatAmount[$dec]->set_num_format($format);
-			$this->formatAmount[$dec]->set_align('right');
+			$this->formatAmount[$dec] =& $this->addFormat();
+			$this->formatAmount[$dec]->setNumFormat($format);
+			$this->formatAmount[$dec]->setAlign('right');
 		}
 		return $this->formatAmount[$dec];
 	}
 
-	function Font($style = 'normal')
+	function Font($fontname = '', $style = 'normal')
+	{
+	}
+	
+	function SetFontSize($size)
 	{
+		$this->fontSize = $size;
 	}
 
 	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();
-		//$this->docTitle($this->title);
-		//$this->docAuthor($app_title . ' ' . $version);
-		//$this->docCompany($this->company['coy_name']);
-		//$this->docManager($power_by . ' - ' . $power_url);
 		$year = get_current_fiscalyear();
 		if ($year['closed'] == 0)
 			$how = _("Active");
@@ -183,47 +244,45 @@ class FrontReport extends Workbook
 		if ($tcols > $this->numcols)
 			$this->numcols = $tcols;
 		for ($i = 0; $i < $this->numcols; $i++)
-			$this->sheet->set_column($i, $i, $this->px2units($this->cols[$i + 1] - $this->cols[$i]));
+			$this->sheet->setColumn($i, $i, $this->px2units($this->cols[$i + 1] - $this->cols[$i]));
 	}
 
 	function Header()
 	{
-		$this->y = 0;
 		$tcol = $this->numcols - 1;
-		$this->sheet->set_row($this->y, 20);
+		$this->sheet->setRow($this->y, 20);
 		for ($i = 0; $i < $this->numcols; $i++)
-			$this->sheet->write_blank($this->y, $i, $this->formatTitle);
-		$this->sheet->write_string($this->y, 0, $this->title, $this->formatTitle);
-		$this->sheet->merge_cells($this->y, 0, $this->y, $tcol);
+			$this->sheet->writeBlank($this->y, $i, $this->formatTitle);
+		$this->sheet->writeString($this->y, 0, $this->title, $this->formatTitle);
+		$this->sheet->mergeCells($this->y, 0, $this->y, $tcol);
 		$this->NewLine();
-
 		$str = _("Print Out Date") . ':';
-		$this->sheet->write_string($this->y, 0, $str);
-		$this->sheet->write_string($this->y, 1, Today() . "  ".Now());
-		$this->sheet->write_string($this->y, $tcol-1, $this->company['coy_name']);
-		$this->sheet->merge_cells($this->y, $tcol-1, $this->y, $tcol);
+		$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+		$this->sheet->writeString($this->y, 1, Today() . "  ".Now(), $this->formatLeft);
+		$this->sheet->writeString($this->y, $tcol-1, $this->company['coy_name'], $this->formatLeft);
+		$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
 		$this->NewLine();
 		$str = _("Fiscal Year") . ':';
-		$this->sheet->write_string($this->y, 0, $str);
+		$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
 		$str = $this->fiscal_year;
-		$this->sheet->write_string($this->y, 1, $str);
-		$this->sheet->write_string($this->y, $tcol-1, $this->host);
-		$this->sheet->merge_cells($this->y, $tcol-1, $this->y, $tcol);
+		$this->sheet->writeString($this->y, 1, $str, $this->formatLeft);
+		$this->sheet->writeString($this->y, $tcol-1, $this->host, $this->formatLeft);
+		$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
 		for ($i = 1; $i < count($this->params); $i++)
 		{
 			if ($this->params[$i]['from'] != '')
 			{
 				$this->NewLine();
 				$str = $this->params[$i]['text'] . ':';
-				$this->sheet->write_string($this->y, 0, $str);
+				$this->sheet->writeString($this->y, 0, $str);
 				$str = $this->params[$i]['from'];
 				if ($this->params[$i]['to'] != '')
 					$str .= " - " . $this->params[$i]['to'];
-				$this->sheet->write_string($this->y, 1, $str);
+				$this->sheet->writeString($this->y, 1, $str, $this->formatLeft);
 				if ($i == 1)
 				{
-					$this->sheet->write_string($this->y, $tcol-1, $this->user);
-					$this->sheet->merge_cells($this->y, $tcol-1, $this->y, $tcol);
+					$this->sheet->writeString($this->y, $tcol-1, $this->user, $this->formatLeft);
+					$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
 				}	
 			}
 		}
@@ -231,8 +290,8 @@ class FrontReport extends Workbook
 		{
 			$this->NewLine();
 			$str = _("Comments") . ':';
-			$this->sheet->write_string($this->y, 0, $str);
-			$this->sheet->write_string($this->y, 1, $this->params[0]);
+			$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+			$this->sheet->writeString($this->y, 1, $this->params[0], $this->formatLeft);
 		}
 		$this->NewLine();
 		if ($this->headers2 != null)
@@ -242,13 +301,13 @@ class FrontReport extends Workbook
 				if ($this->cols2[$j] >= $this->cols[$i] && $this->cols2[$j] <= $this->cols[$i + 1])
 				{
 					if ($this->aligns2[$j] == "right")
-						$this->sheet->write_string($this->y, $i, $this->headers2[$j], $this->formatHeaderRight);
+						$this->sheet->writeString($this->y, $i, $this->headers2[$j], $this->formatHeaderRight);
 					else	
-						$this->sheet->write_string($this->y, $i, $this->headers2[$j], $this->formatHeaderLeft);
+						$this->sheet->writeString($this->y, $i, $this->headers2[$j], $this->formatHeaderLeft);
 					$j++;	
 				}
 				else
-					$this->sheet->write_string($this->y, $i, "", $this->formatHeaderLeft);
+					$this->sheet->writeString($this->y, $i, "", $this->formatHeaderLeft);
 			}		
 			$this->NewLine();
 		}
@@ -260,10 +319,10 @@ class FrontReport extends Workbook
 			else
 				$header = $this->headers[$i];
 			if ($this->aligns[$i] == "right")
-				$this->sheet->write_string($this->y, $i, $header, $this->formatHeaderRight);
+				$this->sheet->writeString($this->y, $i, $header, $this->formatHeaderRight);
 			else	
-				$this->sheet->write_string($this->y, $i, $header, $this->formatHeaderLeft);
-		}		
+				$this->sheet->writeString($this->y, $i, $header, $this->formatHeaderLeft);
+		}
 		$this->NewLine();
 	}
 
@@ -272,6 +331,168 @@ class FrontReport extends Workbook
 		return;
 	}
 
+	// Alternate header style - primary differences are for PDFs
+	function Header3()
+	{
+		// Flag to make sure we only print the company name once
+		$companyNamePrinted = false;
+		
+		$this->y = 0;
+		$tcol = $this->numcols - 1;
+		$this->sheet->setRow($this->y, 20);
+		// Title
+		for ($i = 0; $i < $this->numcols; $i++)
+			$this->sheet->writeBlank($this->y, $i, $this->formatTitle);
+		$this->sheet->writeString($this->y, 0, $this->title, $this->formatTitle);
+		$this->sheet->mergeCells($this->y, 0, $this->y, $tcol);
+
+		// Dimension 1 - optional
+		// - only print if available and not blank
+		if (count($this->params) > 3)
+			if ($this->params[3]['from'] != '')
+			{
+				$this->NewLine();
+				$str = $this->params[3]['text'] . ':';
+				$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+				$this->sheet->writeString($this->y, 1, $this->params[3]['from'], $this->formatLeft);
+				// Company Name - at end of this row
+				if (!$companyNamePrinted)
+				{
+					$this->sheet->writeString($this->y, $tcol-1, $this->company['coy_name'], $this->formatLeft);
+					$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
+					$companyNamePrinted = true;
+				}
+			}
+
+
+		// Dimension 2 - optional
+		// - only print if available and not blank
+		if (count($this->params) > 4)
+			if ($this->params[4]['from'] != '')
+			{
+				$this->NewLine();
+				$str = $this->params[4]['text'] . ':';
+				$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+				$this->sheet->writeString($this->y, 1, $this->params[4]['from'], $this->formatLeft);
+				// Company Name - at end of this row
+				if (!$companyNamePrinted)
+				{
+					$this->sheet->writeString($this->y, $tcol-1, $this->company['coy_name'], $this->formatLeft);
+					$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
+					$companyNamePrinted = true;
+				}
+			}
+			
+		// Tags - optional
+		// TBD!!!		
+	
+		// Report Date - time period covered
+		// - can specify a range, or just the end date (and the report contents
+		//   should make it obvious what the beginning date is)
+		$this->NewLine();
+		$str = _("Report Date") . ':';
+		$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+		$str = '';
+		if ($this->params[1]['from'] != '')
+			$str = $this->params[1]['from'] . ' - ';
+		$str .= $this->params[1]['to'];
+		$this->sheet->writeString($this->y, 1, $str, $this->formatLeft);
+		// Company Name - at end of this row
+		if (!$companyNamePrinted)
+		{
+			$this->sheet->writeString($this->y, $tcol-1, $this->company['coy_name'], $this->formatLeft);
+			$this->sheet->mergeCells($this->y, $tcol-1, $this->y, $tcol);
+			$companyNamePrinted = true;
+		}
+			
+		// Timestamp of when this copy of the report was generated 
+		$this->NewLine();
+		$str = _("Generated At") . ':';
+		$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+		$this->sheet->writeString($this->y, 1, Today() . "  ".Now(), $this->formatLeft);
+
+		// Name of the user that generated this copy of the report
+		$this->NewLine();
+		$str = _("Generated By") . ':';
+		$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+		$str = $this->user;
+		$this->sheet->writeString($this->y, 1, $str, $this->formatLeft);
+
+		// Comments - display any user-generated comments for this copy of the report
+		if ($this->params[0] != '')
+		{
+			$this->NewLine();
+			$str = _("Comments") . ':';
+			$this->sheet->writeString($this->y, 0, $str, $this->formatLeft);
+			$this->sheet->writeString($this->y, 1, $this->params[0], $this->formatLeft);
+		}
+		$this->NewLine();
+
+		if ($this->headers2 != null)
+		{
+			for ($i = 0, $j = 0; $i < $this->numcols; $i++)
+			{
+				if ($this->cols2[$j] >= $this->cols[$i] && $this->cols2[$j] <= $this->cols[$i + 1])
+				{
+					if ($this->aligns2[$j] == "right")
+						$this->sheet->writeString($this->y, $i, $this->headers2[$j], $this->formatTopHeaderRight);
+					else	
+						$this->sheet->writeString($this->y, $i, $this->headers2[$j], $this->formatTopHeaderLeft);
+					$j++;	
+				}
+				else
+					$this->sheet->writeString($this->y, $i, "", $this->formatTopHeaderLeft);
+			}		
+			$this->NewLine();
+		}
+
+		for ($i = 0; $i < $this->numcols; $i++)
+		{
+			if (!isset($this->headers[$i]))
+				$header = "";
+			else
+				$header = $this->headers[$i];
+			if ($this->aligns[$i] == "right")
+				if ($this->headers2 == null)
+					$this->sheet->writeString($this->y, $i, $header, $this->formatHeaderRight);
+				else
+					$this->sheet->writeString($this->y, $i, $header, $this->formatBottomHeaderRight);
+			else	
+				if ($this->headers2 == null)
+					$this->sheet->writeString($this->y, $i, $header, $this->formatHeaderLeft);
+				else
+					$this->sheet->writeString($this->y, $i, $header, $this->formatBottomHeaderLeft);
+		}
+		$this->NewLine();
+	}
+
+	/**
+	 * Format a numeric string date into something nicer looking.
+	 *
+	 * @param string $date Date string to be formatted.
+	 * @param int $input_format Format of the input string.  Possible values are:<ul><li>0: user's default (default)</li></ul>
+	 * @param int $output_format Format of the output string.  Possible values are:<ul><li>0: Month (word) Day (numeric), 4-digit Year - Example: January 1, 2000 (default)</li><li>1: Month 4-digit Year - Example: January 2000</li><li>2: Month Abbreviation 4-digit Year - Example: Jan 2000</li></ul>
+	 * @access public
+	 */
+	function DatePrettyPrint($date, $input_format = 0, $output_format = 0)
+	{
+		if ($date != '')
+		{
+			$date = date2sql($date);
+			$year = (int) (substr($date, 0, 4));
+			$month = (int) (substr($date, 5, 2));
+			$day = (int) (substr($date, 8, 2));
+			if ($output_format == 0)
+				return(date('F j, Y', mktime(12, 0, 0, $month, $day, $year)));
+			elseif ($output_format == 1)
+				return(date('F Y', mktime(12, 0, 0, $month, $day, $year)));
+			elseif ($output_format == 2)
+				return(date('M Y', mktime(12, 0, 0, $month, $day, $year)));
+		}
+		else
+			return $date;
+	}
+		
 	function AddImage($logo, $x, $y, $w, $h)
 	{
 		return;
@@ -287,61 +508,122 @@ class FrontReport extends Workbook
 		return;
 	}
 
-	function Text($c, $txt, $n=0, $corr=0, $r=0)
+	function SetFillColor($r, $g, $b)
+	{
+		return;
+	}
+	
+	function GetCellPadding()
+	{
+		return 0;
+	}
+	
+	function SetCellPadding($pad)
+	{
+		return;
+	}
+	
+	function Text($c, $txt, $n=0, $corr=0, $r=0, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
 		return;
 	}
 
-	function TextWrap($xpos, $ypos, $len, $str, $align = 'left')
+	function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 0)
 	{
 		return;
 	}
 
-	function TextCol($c, $n, $txt, $corr=0, $r=0)
+	function TextCol($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
+		$txt = html_entity_decode($txt);	
 		if ($this->aligns[$c] == 'right')
-			$this->sheet->write_string($this->y, $c, $txt, $this->formatRight);
+			$this->sheet->writeString($this->y, $c, $txt, $this->formatRight);
 		else	
-			$this->sheet->write_string($this->y, $c, $txt);
+			$this->sheet->writeString($this->y, $c, $txt, $this->formatLeft);
 		if ($n - $c > 1)
-			$this->sheet->merge_cells($this->y, $c, $this->y, $n - 1);
+			$this->sheet->mergeCells($this->y, $c, $this->y, $n - 1);
 	}
 
-	function AmountCol($c, $n, $txt, $dec=0, $corr=0, $r=0) 
+	function AmountCol($c, $n, $txt, $dec=0, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0, $color_red=false) 
 	{ 
 		if (!is_numeric($txt))
 			$txt = 0;
-		$this->sheet->write_number($this->y, $c, $txt, $this->NumFormat($dec)); 
+		$this->sheet->writeNumber($this->y, $c, $txt, $this->NumFormat($dec)); 
 	}
 	
-	function DateCol($c, $n, $txt, $conv=false, $corr=0, $r=0) 
+	function AmountCol2($c, $n, $txt, $dec=0, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0, $color_red=false, $amount_locale = NULL, $amount_format = NULL) 
+	{ 
+		if (!is_numeric($txt))
+			$txt = 0;
+		$this->sheet->writeNumber($this->y, $c, $txt, $this->NumFormat($dec)); 
+	}
+	
+	function DateCol($c, $n, $txt, $conv=false, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0) 
 	{
 		if (!$conv)
 			$txt = date2sql($txt);
-		list($year, $mo, $day) = explode("-", $txt);	
+		list($year, $mo, $day) = explode("-", $txt);
 		$date = $this->ymd2date((int)$year, (int)$mo, (int)$day);
-		//$date = $this->ymd2date(2009, 3, 2);
-		$this->sheet->write_number($this->y, $c, $date, $this->formatDate);
-		//$this->sheet->write_string($this->y, $c, $txt);
+		$this->sheet->writeNumber($this->y, $c, $date, $this->formatDate);
 	}
 
-	function TextCol2($c, $n, $txt, $corr=0, $r=0)
+	function TextCol2($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
-		$this->sheet->write_string($this->y, $c, $txt);
+		$txt = html_entity_decode($txt);	
+		$this->sheet->writeString($this->y, $c, $txt, $this->formatLeft);
 		if ($n - $c > 1)
-			$this->sheet->merge_cells($this->y, $c, $this->y, $n - 1);
+			$this->sheet->mergeCells($this->y, $c, $this->y, $n - 1);
 	}
 
-	function TextColLines($c, $n, $txt, $corr=0, $r=0)
+	function TextColLines($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
 		return;
 	}
 
-	function TextWrapLines($c, $width, $txt, $align='left')
+	function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0)
+	{
+		return;
+	}
+
+	/**
+	 * Crude text wrap calculator based on PDF version.
+	 */
+	function TextWrapCalc($txt, $width, $spacebreak=false)
+	{
+		// Assume an average character width
+		$avg_char_width = 5;
+		$ret = "";
+		$txt2 = $txt;
+		$w = strlen($txt) * $avg_char_width;
+		if ($w > $width && $w > 0 && $width != 0)
+		{
+			$n = strlen($txt);
+			$k = intval($n * $width / $w);
+			if ($k > 0 && $k < $n)
+			{
+				$txt2 = substr($txt, 0, $k);
+				if ($spacebreak && (($pos = strrpos($txt2, " ")) !== false))
+				{
+					$txt2 = substr($txt2, 0, $pos);
+					$ret = substr($txt, $pos+1);
+				}
+				else
+					$ret = substr($txt, $k);
+			}
+		}
+		return array($txt2, $ret);
+	}
+
+	function SetLineStyle($style)
 	{
 		return;
 	}
 
+	function SetLineWidth($width)
+	{
+		return;
+	}
+	
 	function LineTo($from, $row, $to, $row2)
 	{
 		return;
@@ -352,11 +634,33 @@ class FrontReport extends Workbook
 		return;
 	}
 
-	function NewLine($l=1, $np=0)
+	function UnderlineCell($c, $r = 0, $type = 1, $linewidth = 0, $style = array())
+	{
+		return;
+	}
+	
+	function NewLine($l=1, $np=0, $h=NULL)
 	{
 		$this->y += $l;
+		if ($this->y > MAX_ROW_SHEET)
+		{
+			$this->y = 0;
+			$this->sheet = $this->addWorksheet();
+			if ($this->code != "iso-8859-1")
+				$this->sheet->setInputEncoding($this->code); // set sheet encoding
+			if ($_SESSION['language']->dir == 'rtl')
+				$this->sheet->setRTL();
+			for ($i = 0; $i < $this->numcols; $i++)
+				$this->sheet->setColumn($i, $i, $this->px2units($this->cols[$i + 1] - $this->cols[$i]));
+		}
 	}
-
+	
+	function NewPage()
+	{
+		if (method_exists($this, $this->headerFunc))	// draw predefined page layout if any
+			$this->{$this->headerFunc}();
+	}
+	
   	function ymd2Date($year, $mon, $day) // XLS internal date representation is a number between 1900-01-01 and 2078-12-31
   	{										// if we need the time part too, we have to add this value after a decimalpoint.
       	$mo = array(0,31,28,31,30,31,30,31,31,30,31,30,31);
@@ -393,25 +697,17 @@ class FrontReport extends Workbook
   	function px2units($px) // XLS app conversion. Not bulletproof.
   	{
   		$excel_column_width_factor = 256;
-  		$unit_offset_length = 6.5;
-  		/*	
-  		$unit_offset_map = array(0, 36, 73, 109, 146, 182, 219);
-  		$width_units = $excel_column_width_factor * ($px / $unit_offset_length);
-  		$width_units += $unit_offset_map[($px % $unit_offset_length)];
-  		return $width_units;
-  	  	$pixels = (float)((float)$px / (float)$excel_column_width_factor) * $unit_offset_length;
-    	$ofs = $px % $excel_column_width_factor;
-    	$pixels += round((float)$ofs / ((float) $excel_column_width_factor / $unit_offset_length));
-    	return (int)$pixels;
-  		*/
+  		$unit_offset_length = $this->excelColWidthFactor;
   		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;
 		for ($i = 0; $i < $this->numcols; $i++)
-			$this->sheet->write_blank($this->y, $i, $this->formatFooter);
-		$this->sheet->merge_cells($this->y, 0, $this->y, $this->numcols - 1);
+			$this->sheet->writeBlank($this->y, $i, $this->formatFooter);
+		$this->sheet->mergeCells($this->y, 0, $this->y, $this->numcols - 1);
 		$this->close();
 		// first have a look through the directory, 
 		// and remove old temporary pdfs
@@ -427,9 +723,9 @@ class FrontReport extends Workbook
 			}
 			closedir($d);
 		}
-		meta_forward($_SERVER['PHP_SELF'], "xls=1&filename=$this->filename&unique=$this->unique_name");
+
+		meta_forward($path_to_root.'/reporting/prn_redirect.php', "xls=1&filename=$this->filename&unique=$this->unique_name");
 		exit();
 	}
 }
 
-?>
\ No newline at end of file