X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fexcel_report.inc;h=fbb843f28b173f76ec0ee4f2692fd16fdd491480;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=931abc93fc58a72896228d0903aceff0559865aa;hpb=18ccf94f0421e7693bc40e177732a3f937b54d1a;p=fa-stable.git

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 931abc93..fbb843f2 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -9,7 +9,6 @@
     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");
@@ -142,10 +141,12 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	{
 		if (!isset($this->formatAmount[$dec]))
 		{
-			global $thoseps,$decseps;
+			//global $thoseps,$decseps;
 			$dec = (int)$dec;
-			$tsep = $thoseps[user_tho_sep()];
-			$dsep = $decseps[user_dec_sep()];
+			//$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);
@@ -165,10 +166,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 	{
 		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");
@@ -325,9 +322,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 			$txt = date2sql($txt);
 		list($year, $mo, $day) = explode("-", $txt);	
 		$date = $this->ymd2date((int)$year, (int)$mo, (int)$day);
-		//$date = $this->ymd2date(2009, 3, 2);
 		$this->sheet->writeNumber($this->y, $c, $date, $this->formatDate);
-		//$this->sheet->write_string($this->y, $c, $txt);
 	}
 
 	function TextCol2($c, $n, $txt, $corr=0, $r=0)
@@ -399,16 +394,6 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
   	{
   		$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;
-  		*/
   		return ($px / $unit_offset_length);
   	}