Release 2.1.0 Release Candidate (RC)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6a5cc5f26dff9cb8ff200850fc3f6f2c7ed47e6b..f7a62e7ead868ca7acc8cdd757c28dea28c12eb6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+------------------------------- Release 2.1.0 RC ------------------------------------------------
+09-Mar-2009 Joe Hunt
+! Release 2.1.0 Release Candidate (RC).
+$ config.php
+! Report clean up
+$ /reporting/includes/excel_report.inc
+
 09-Mar-2009 Janusz Dobrowolski
 # Initial prefs for new created user now copied form current admin settings.
 $ /admin/users.php
@@ -30,7 +37,7 @@ $ /inventory/manage/items.php
 $ /includes/session.inc
 
 08-Mar-2009 Joe Hunt
-! XLS engine now compatible med PEAR Excel Writer.
+! XLS engine now compatible with PEAR Excel Writer.
 $ /reporting/includes/excel_report.inc
   /reporting/includes/Workbook.php
   

diff --git a/config.php b/config.php
index aaf3580d5c0eadb3961754dc1b3e65f88169db8f..4b6422865d83acd8d7020300b15f88435d225447 100644 (file)
--- a/config.php
+++ b/config.php
@@ -46,7 +46,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.1.0 beta 2";
+       $version                = "2.1.0 RC";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 931abc93fc58a72896228d0903aceff0559865aa..0f25ea0cbd0b7dbc4bcb0cfb2d425accc528573c 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -165,10 +165,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 +321,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 +393,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);
        }