From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 22 Mar 2009 23:26:09 +0000 (+0000)
Subject: Bad thousand/decimal formatting in XLS reports.(OpenOffice)
X-Git-Tag: 2.3-final~1310
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ab2c3a8ffecec2997c29b5a907d5b632c1b64af2;hp=7aec26586cfb1fc93a134bc6c621ef0da2b2cc4c;p=fa-stable.git

Bad thousand/decimal formatting in XLS reports.(OpenOffice)
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 42e8664a..e9b94c19 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Mar-2009 Joe Hunt
+# Bad thousand/decimal formatting in XLS reports.(OpenOffice)
+$ /reporting/including/excel_report.inc
+
 22-Mar-2009 Janusz Dobrowolski/Joe Hun rerun, didn't work (empty file when inserting)
 # Fixed item picture display after upload, fixed item image filenames. Option to remove image.
 $ /inventory/manage/items.php
diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 0f25ea0c..e565552b 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -142,10 +142,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);