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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 42e8664ac0ab5abe497428e3f544a65e5bd93d78..e9b94c19718b00d47db3539877dabad79eae9cbf 100644 (file)
--- 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 0f25ea0cbd0b7dbc4bcb0cfb2d425accc528573c..e565552b897f0937acac62d5d16773d151ccec51 100644 (file)
--- 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);