Annual Expense Breakdown Report: additional bugfix.
[fa-stable.git] / reporting / rep705.php
index 2c5ce3f53b36949a910141c35dc0d835f259c706..f32e5674c2f1337010b880d846880ea1d09b237e 100644 (file)
@@ -1,33 +1,37 @@
 <?php
-
-$page_security = 2;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_GLANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
-// Creator:    Joe Hunt
+// Creator:    Joe Hunt, Chaitanya for the recursive version 2009-02-05.
 // date_:      2005-05-19
 // Title:      Annual expense breakdown
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
+include_once($path_to_root . "/admin/db/tags_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_annual_expense_breakdown();
 
 //----------------------------------------------------------------------------------------------------
 
-function getPeriods($year, $account, $dimension, $dimension2)
+function getPeriods($yr, $mo, $account, $dimension, $dimension2, $thousands)
 {
-       //$yr = date('Y');
-       //$mo = date('m'):
-       // from now
-       $yr = $year;
-       $mo = 12;
        $date13 = date('Y-m-d',mktime(0,0,0,$mo+1,1,$yr));
        $date12 = date('Y-m-d',mktime(0,0,0,$mo,1,$yr));
        $date11 = date('Y-m-d',mktime(0,0,0,$mo-1,1,$yr));
@@ -42,24 +46,25 @@ function getPeriods($year, $account, $dimension, $dimension2)
        $date02 = date('Y-m-d',mktime(0,0,0,$mo-10,1,$yr));
        $date01 = date('Y-m-d',mktime(0,0,0,$mo-11,1,$yr));
 
-    $sql = "SELECT SUM(CASE WHEN tran_date >= '$date01' AND tran_date < '$date02' THEN -amount / 1000 ELSE 0 END) AS per01,
-                               SUM(CASE WHEN tran_date >= '$date02' AND tran_date < '$date03' THEN -amount / 1000 ELSE 0 END) AS per02,
-                               SUM(CASE WHEN tran_date >= '$date03' AND tran_date < '$date04' THEN -amount / 1000 ELSE 0 END) AS per03,
-                               SUM(CASE WHEN tran_date >= '$date04' AND tran_date < '$date05' THEN -amount / 1000 ELSE 0 END) AS per04,
-                               SUM(CASE WHEN tran_date >= '$date05' AND tran_date < '$date06' THEN -amount / 1000 ELSE 0 END) AS per05,
-                               SUM(CASE WHEN tran_date >= '$date06' AND tran_date < '$date07' THEN -amount / 1000 ELSE 0 END) AS per06,
-                               SUM(CASE WHEN tran_date >= '$date07' AND tran_date < '$date08' THEN -amount / 1000 ELSE 0 END) AS per07,
-                               SUM(CASE WHEN tran_date >= '$date08' AND tran_date < '$date09' THEN -amount / 1000 ELSE 0 END) AS per08,
-                               SUM(CASE WHEN tran_date >= '$date09' AND tran_date < '$date10' THEN -amount / 1000 ELSE 0 END) AS per09,
-                               SUM(CASE WHEN tran_date >= '$date10' AND tran_date < '$date11' THEN -amount / 1000 ELSE 0 END) AS per10,
-                               SUM(CASE WHEN tran_date >= '$date11' AND tran_date < '$date12' THEN -amount / 1000 ELSE 0 END) AS per11,
-                               SUM(CASE WHEN tran_date >= '$date12' AND tran_date < '$date13' THEN -amount / 1000 ELSE 0 END) AS per12
+    $sql = "SELECT SUM(CASE WHEN tran_date >= '$date01' AND tran_date < '$date02' THEN amount / $thousands ELSE 0 END) AS per01,
+                               SUM(CASE WHEN tran_date >= '$date02' AND tran_date < '$date03' THEN amount / $thousands ELSE 0 END) AS per02,
+                               SUM(CASE WHEN tran_date >= '$date03' AND tran_date < '$date04' THEN amount / $thousands ELSE 0 END) AS per03,
+                               SUM(CASE WHEN tran_date >= '$date04' AND tran_date < '$date05' THEN amount / $thousands ELSE 0 END) AS per04,
+                               SUM(CASE WHEN tran_date >= '$date05' AND tran_date < '$date06' THEN amount / $thousands ELSE 0 END) AS per05,
+                               SUM(CASE WHEN tran_date >= '$date06' AND tran_date < '$date07' THEN amount / $thousands ELSE 0 END) AS per06,
+                               SUM(CASE WHEN tran_date >= '$date07' AND tran_date < '$date08' THEN amount / $thousands ELSE 0 END) AS per07,
+                               SUM(CASE WHEN tran_date >= '$date08' AND tran_date < '$date09' THEN amount / $thousands ELSE 0 END) AS per08,
+                               SUM(CASE WHEN tran_date >= '$date09' AND tran_date < '$date10' THEN amount / $thousands ELSE 0 END) AS per09,
+                               SUM(CASE WHEN tran_date >= '$date10' AND tran_date < '$date11' THEN amount / $thousands ELSE 0 END) AS per10,
+                               SUM(CASE WHEN tran_date >= '$date11' AND tran_date < '$date12' THEN amount / $thousands ELSE 0 END) AS per11,
+                               SUM(CASE WHEN tran_date >= '$date12' AND tran_date < '$date13' THEN amount / $thousands ELSE 0 END) AS per12,
+                               SUM(CASE WHEN tran_date >= '$date01' AND tran_date < '$date13' THEN amount / $thousands ELSE 0 END) AS pertotal
                        FROM ".TB_PREF."gl_trans
                                WHERE account='$account'";
-       if ($dimension > 0)
-               $sql .= " AND dimension_id = $dimension";
-       if ($dimension2 > 0)
-               $sql .= " AND dimension2_id = $dimension2";
+       if ($dimension != 0)
+               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+       if ($dimension2 != 0)
+               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
 
        $result = db_query($sql, "Transactions for account $account could not be calculated");
 
@@ -68,47 +73,171 @@ function getPeriods($year, $account, $dimension, $dimension2)
 
 //----------------------------------------------------------------------------------------------------
 
+function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dimension, $dimension2, 
+                                                               $tags, $thousands)
+{
+       $ctotal = array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+       $total = array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+       $totals_arr = array();
+
+       $printtitle = 0; //Flag for printing type name  
+
+       //Get Accounts directly under this group/type
+       $result = get_gl_accounts(null, null, $type);   
+       while ($account=db_fetch($result))
+       {
+               if ($tags != -1 && is_array($tags) && $tags[0] != false)
+               {
+                       if (!is_record_in_tags($tags, TAG_ACCOUNT, $account['account_code']))
+                               continue;
+               }       
+               $bal = getPeriods($yr, $mo, $account["account_code"], $dimension, $dimension2, $thousands);
+               if (!$bal['per01'] && !$bal['per02'] && !$bal['per03'] && !$bal['per04'] &&     !$bal['per05'] && 
+                       !$bal['per06'] && !$bal['per07'] && !$bal['per08'] && !$bal['per09'] && !$bal['per10'] && 
+                       !$bal['per11'] && !$bal['per12'])
+                       continue;
+       
+               //Print Type Title if it has at least one non-zero account      
+               if (!$printtitle)
+               {
+                       $printtitle = 1;
+                       $rep->row -= 4;
+                       $rep->TextCol(0, 5, $typename);
+                       $rep->row -= 4;
+                       $rep->Line($rep->row);
+                       $rep->NewLine();
+               }                       
+
+               $balance = array(1 => $bal['per01'], $bal['per02'], $bal['per03'], $bal['per04'],
+                       $bal['per05'], $bal['per06'], $bal['per07'], $bal['per08'],
+                       $bal['per09'], $bal['per10'], $bal['per11'], $bal['per12'], $bal[pertotal]);
+               $rep->TextCol(0, 1,     $account['account_code']);
+               $rep->TextCol(1, 2,     $account['account_name']);
+
+               for ($i = 1; $i <= 13; $i++)
+               {
+                       $rep->AmountCol($i + 1, $i + 2, $balance[$i] * $convert, $dec);
+                       $ctotal[$i] += $balance[$i];
+               }
+
+               $rep->NewLine();
+       }
+               
+       //Get Account groups/types under this group/type
+       $result = get_account_types(false, false, $type);
+       while ($accounttype=db_fetch($result))
+       {
+               //Print Type Title if has sub types and not previously printed
+               if (!$printtitle)
+               {
+                       $printtitle = 1;
+                       $rep->row -= 4;
+                       $rep->TextCol(0, 5, $typename);
+                       $rep->row -= 4;
+                       $rep->Line($rep->row);
+                       $rep->NewLine();
+               }
+
+               $totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep,
+                                                                                       $dimension, $dimension2, $tags, $thousands);
+               for ($i = 1; $i <= 13; $i++)
+               {
+                       $total[$i] += $totals_arr[$i];
+               }
+       }
+
+       //Display Type Summary if total is != 0 OR head is printed (Needed in case of unused hierarchical COA) 
+       if ($printtitle)
+       {
+               $rep->row += 6;
+               $rep->Line($rep->row);
+               $rep->NewLine();
+               $rep->TextCol(0, 2,     _('Total') . " " . $typename);
+               for ($i = 1; $i <= 13; $i++)
+                       $rep->AmountCol($i + 1, $i + 2, ($total[$i] + $ctotal[$i]) * $convert, $dec);
+               $rep->NewLine();
+       }
+       for ($i = 1; $i <= 13; $i++)
+               $totals_arr[$i] = $total[$i] + $ctotal[$i];     
+       return $totals_arr;
+}
+
+//----------------------------------------------------------------------------------------------------
+
 function print_annual_expense_breakdown()
 {
-       global $path_to_root, $date_system;
+       global $path_to_root, $SysPrefs;
 
-       include_once($path_to_root . "reporting/includes/pdf_report.inc");
        $dim = get_company_pref('use_dimension');
        $dimension = $dimension2 = 0;
+       $thousands = 0;
 
        if ($dim == 2)
        {
                $year = $_POST['PARAM_0'];
                $dimension = $_POST['PARAM_1'];
                $dimension2 = $_POST['PARAM_2'];
-               $comments = $_POST['PARAM_3'];
+               $tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1);
+               $comments = $_POST['PARAM_4'];
+               $orientation = $_POST['PARAM_5'];
+               $thousands = $_POST['PARAM_6'];
+               $destination = $_POST['PARAM_7'];
        }
-       else if ($dim == 1)
+       elseif ($dim == 1)
        {
                $year = $_POST['PARAM_0'];
                $dimension = $_POST['PARAM_1'];
-               $comments = $_POST['PARAM_2'];
+               $tags = (isset($_POST['PARAM_2']) ? $_POST['PARAM_2'] : -1);
+               $comments = $_POST['PARAM_3'];
+               $orientation = $_POST['PARAM_4'];
+               $thousands = $_POST['PARAM_5'];
+               $destination = $_POST['PARAM_6'];
        }
        else
        {
                $year = $_POST['PARAM_0'];
-               $comments = $_POST['PARAM_1'];
+               $tags = (isset($_POST['PARAM_1']) ? $_POST['PARAM_1'] : -1);
+               $comments = $_POST['PARAM_2'];
+               $orientation = $_POST['PARAM_3'];
+               $thousands = $_POST['PARAM_4'];
+               $destination = $_POST['PARAM_5'];
        }
-       $dec = 1;
-       //$pdec = user_percent_dec();
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+
+       $orientation = ($orientation ? 'L' : 'P');
+       if ($thousands)
+       {
+               $dec = 1;
+               $thousands = 1000;
+               $amts_thousands = _("Amounts in thousands");
+               $fontSize = 9;
+       }
+       else
+       {
+               $dec = 2;
+               $thousands = 1;
+               $amts_thousands = "";
+               $fontSize = ($orientation == 'P' ? 7 : 8);
+       }
+
+       $cols = array(0, 34, 130, 162, 194, 226, 258, 290, 322, 354, 386, 418, 450, 482, 514, 546);
+       //------------0--1---2----3----4----5----6----7----8----10---11---12---13---14---15---16-
 
-       $cols = array(0, 40, 150, 180, 210, 240, 270, 300, 330, 360, 390, 420, 450, 480, 510);
-       //------------0--1---2----3----4----5----6----7----8----10---11---12---13---14---15-
-       
-       //$yr = date('Y');
-       //$mo = date('m'):
        // from now
-       $yr = $year;
-       $mo = 12;
+       $sql = "SELECT begin, end, YEAR(end) AS yr, MONTH(end) AS mo FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year);
+       $result = db_query($sql, "could not get fiscal year");
+       $row = db_fetch($result);
+       
+       $year = sql2date($row['begin'])." - ".sql2date($row['end']);
+       $yr = $row['yr'];
+       $mo = $row['mo'];
        $da = 1;
-       if ($date_system == 1)
+       if ($SysPrefs->date_system == 1)
                list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da);
-       else if ($date_system == 2)
+       elseif ($SysPrefs->date_system == 2)
                list($yr, $mo, $da) = islamic_to_gregorian($yr, $mo, $da);
        $per12 = strftime('%b',mktime(0,0,0,$mo,$da,$yr));
        $per11 = strftime('%b',mktime(0,0,0,$mo-1,$da,$yr));
@@ -122,185 +251,105 @@ function print_annual_expense_breakdown()
        $per03 = strftime('%b',mktime(0,0,0,$mo-9,$da,$yr));
        $per02 = strftime('%b',mktime(0,0,0,$mo-10,$da,$yr));
        $per01 = strftime('%b',mktime(0,0,0,$mo-11,$da,$yr));
-       
+
        $headers = array(_('Account'), _('Account Name'), $per01, $per02, $per03, $per04,
-               $per05, $per06, $per07, $per08, $per09, $per10, $per11, $per12);
-       
+               $per05, $per06, $per07, $per08, $per09, $per10, $per11, $per12, _('Total'));
+
        $aligns = array('left', 'left', 'right', 'right', 'right',      'right', 'right', 'right',
-               'right', 'right', 'right',      'right', 'right', 'right');
-    
+               'right', 'right', 'right',      'right', 'right', 'right', 'right');
+
     if ($dim == 2)
     {
        $params =   array(      0 => $comments,
-                       1 => array('text' => _("Year"), 
+                       1 => array('text' => _("Year"),
                                'from' => $year, 'to' => ''),
-                       2 => array('text' => _("Dimension")." 1", 
+                       2 => array('text' => _("Dimension")." 1",
                                'from' => get_dimension_string($dimension), 'to' => ''),
-                       3 => array('text' => _("Dimension")." 2", 
+                       3 => array('text' => _("Dimension")." 2",
                                'from' => get_dimension_string($dimension2), 'to' => ''),
-                       4 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       4 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
+                       5 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
-    else if ($dim == 1)
+    elseif ($dim == 1)
     {
        $params =   array(      0 => $comments,
-                       1 => array('text' => _("Year"), 
+                       1 => array('text' => _("Year"),
                                'from' => $year, 'to' => ''),
-                       2 => array('text' => _('Dimension'), 
+                       2 => array('text' => _('Dimension'),
                                'from' => get_dimension_string($dimension), 'to' => ''),
-                       3 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       3 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
+                       4 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
     else
     {
        $params =   array(      0 => $comments,
-                       1 => array('text' => _("Year"), 
+                       1 => array('text' => _("Year"),
                                'from' => $year, 'to' => ''),
-                       2 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
+                       3 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
 
-       $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown.pdf", user_pagesize());
+       $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), $fontSize,
+                                                                               $orientation);
+   if ($orientation == 'L')
+       recalculate_cols($cols);
+       elseif (user_pagesize() == 'A4')
+       {
+               // Portrait, so adjust columns for A4, 16.7 pts narrower than Letter
+               for ($i = 2; $i < sizeof($cols); $i++)
+                       $cols[$i] -= 17;
+       }
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
-       $rep->Header();
+       $rep->NewPage();
 
-       $classname = '';
-       $group = '';
-       $total = Array();
-       $total2 = Array();
-       $sales = Array();
-       $calc = Array();
-       unset($total);
-       unset($total2);
-       unset($sales);
-       unset($calc);
-       $accounts = get_gl_accounts_all(0);
-
-       while ($account = db_fetch($accounts))
+       $sales = Array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+       
+       $classresult = get_account_classes(false, 0);
+       while ($class = db_fetch($classresult))
        {
-               $bal = getPeriods($year, $account["account_code"], $dimension, $dimension2);
-               if (!$bal['per01'] && !$bal['per02'] && !$bal['per03'] && !$bal['per04'] && 
-                       !$bal['per05'] && !$bal['per06'] && !$bal['per07'] && !$bal['per08'] && 
-                       !$bal['per09'] && !$bal['per10'] && !$bal['per11'] && !$bal['per12'])
-                       continue;
-               //if (array_sum($bal) == 0.0)
-               //$i = 1;
-               //foreach ($bal as $b)
-               //      $balance[$i++] = $b;
-               //$balance = $bal;
-               $balance = Array(1 => $bal['per01'], $bal['per02'], $bal['per03'], $bal['per04'], 
-                       $bal['per05'], $bal['per06'], $bal['per07'], $bal['per08'], 
-                       $bal['per09'], $bal['per10'], $bal['per11'], $bal['per12']);
-               if ($account['AccountClassName'] != $classname)
-               {
-                       if ($classname != '')
-                       {
-                               $closeclass = true;
-                       }
-               }
-
-               if ($account['AccountTypeName'] != $group)
-               {
-                       if ($group != '')
-                       {
-                               $rep->Line($rep->row + 6);
-                               $rep->row -= 6;
-                               $rep->TextCol(0, 2,     _('Total') . " " . $group);
-                               for ($i = 1; $i <= 12; $i++)
-                                       $rep->TextCol($i + 1, $i + 2, number_format2($total[$i], $dec));
-                               unset($total);
-                               $rep->row -= ($rep->lineHeight + 4);
-                               if ($closeclass)
-                               {
-                                       $rep->Line($rep->row + 6);
-                                       $rep->row -= 6;
-                                       $rep->Font('bold');
-                                       $rep->TextCol(0, 2,     _('Total') . " " . $classname);
-                                       for ($i = 1; $i <= 12; $i++)
-                                       {
-                                               $rep->TextCol($i + 1, $i + 2, number_format2($total2[$i], $dec));
-                                               $sales[$i] += $total2[$i];
-                                       }       
-                                       $rep->Font();
-                                       unset($total2);
-                                       $rep->NewLine(3);
-                                       $closeclass = false;
-                               }
-                       }
-                       if ($account['AccountClassName'] != $classname)
-                       {
-                               $rep->Font('bold');
-                               $rep->TextCol(0, 5, $account['AccountClassName']);
-                               $rep->Font();
-                               $rep->row -= ($rep->lineHeight + 4);
-                       }
-                       $group = $account['AccountTypeName'];
-                       $rep->TextCol(0, 5, $account['AccountTypeName']);
-                       $rep->Line($rep->row - 4);
-                       $rep->row -= ($rep->lineHeight + 4);
-               }
-               $classname = $account['AccountClassName'];
-               $rep->TextCol(0, 1,     $account['account_code']);
-               $rep->TextCol(1, 2,     $account['account_name']);
-               for ($i = 1; $i <= 12; $i++)
-               {
-                       $rep->TextCol($i + 1, $i + 2, number_format2($balance[$i], $dec));
-                       $total[$i] += $balance[$i];
-                       $total2[$i] += $balance[$i];
-               }                       
-
+               $ctotal = Array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+               $convert = get_class_type_convert($class["ctype"]);             
+               
+               //Print Class Name      
+               $rep->Font('bold');
+               $rep->TextCol(0, 5, $class["class_name"]);
+               $rep->Font();
                $rep->NewLine();
-
-               if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
-               {
-                       $rep->Line($rep->row - 2);
-                       $rep->Header();
-               }
-       }
-       if ($account['AccountClassName'] != $classname)
-       {
-               if ($classname != '')
+               
+               //Get Account groups/types under this group/type with no parents
+               $typeresult = get_account_types(false, $class['cid'], -1);
+               while ($accounttype=db_fetch($typeresult))
                {
-                       $closeclass = true;
+                       $classtotal = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep,
+                                                                                               $dimension,     $dimension2, $tags, $thousands);
+                       for ($i = 1; $i <= 13; $i++)
+                               $ctotal[$i] += $classtotal[$i];
                }
-       }
-       if ($account['AccountTypeName'] != $group)
-       {
-               if ($group != '')
+               
+               //Print Class Summary   
+               $rep->row += 6;
+               $rep->Line($rep->row);
+               $rep->NewLine();
+               $rep->Font('bold');
+               $rep->TextCol(0, 2,     _('Total') . " " . $class["class_name"]);
+               for ($i = 1; $i <= 13; $i++)
                {
-                       $rep->Line($rep->row + 6);
-                       $rep->row -= 6;
-                       $rep->TextCol(0, 2,     _('Total') . " " . $group);
-                       for ($i = 1; $i <= 12; $i++)
-                               $rep->TextCol($i + 1, $i + 2, number_format2($total[$i], $dec));
-                       $rep->row -= ($rep->lineHeight + 4);
-                       if ($closeclass)
-                       {
-                               $rep->Line($rep->row + 6);
-                               $rep->row -= 6;
-
-                               $rep->Font('bold');
-                               $rep->TextCol(0, 2,     _('Total') . " " . $classname);
-                               for ($i = 1; $i <= 12; $i++)
-                               {
-                                       $rep->TextCol($i + 1, $i + 2, number_format2($total2[$i], $dec));
-                                       $calc[$i] = $sales[$i] + $total2[$i];
-                               }       
-
-                               $rep->row -= ($rep->lineHeight + 8);
-                               $rep->TextCol(0, 2,     _('Calculated Return'));
-                               for ($i = 1; $i <= 12; $i++)
-                                       $rep->TextCol($i + 1, $i + 2, number_format2($calc[$i], $dec));
-                               $rep->Font();
-
-                               $rep->NewLine();
-                       }
+                       $rep->AmountCol($i + 1, $i + 2, $ctotal[$i] * $convert, $dec);
+                       $sales[$i] += $ctotal[$i];
                }
+               $rep->Font();
+               $rep->NewLine(2);
        }
+       $rep->Font('bold');     
+       $rep->TextCol(0, 2,     _("Calculated Return"));
+       for ($i = 1; $i <= 13; $i++)
+               $rep->AmountCol($i + 1, $i + 2, $sales[$i] * -1, $dec);
+       $rep->Font();
+       $rep->NewLine();
        $rep->Line($rep->row);
+       $rep->NewLine(2);
        $rep->End();
 }
 
-?>
\ No newline at end of file