Annual Expense Breakdown Report: option to print in thousands, added column for annua...

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 58c58bec9be142a8fb4b0f0334e185e12ec3cbd1..80610ad6c70abc4fd3a4798bfcdebe4f670f4887 100644 (file)
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -30,7 +30,7 @@ print_annual_expense_breakdown();
 
 //----------------------------------------------------------------------------------------------------
 
-function getPeriods($yr, $mo, $account, $dimension, $dimension2)
+function getPeriods($yr, $mo, $account, $dimension, $dimension2, $thousands)
 {
        $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));
@@ -46,18 +46,19 @@ function getPeriods($yr, $mo, $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)
@@ -72,10 +73,11 @@ function getPeriods($yr, $mo, $account, $dimension, $dimension2)
 
 //----------------------------------------------------------------------------------------------------
 
-function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dimension, $dimension2, $tags)
+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);
-       $total = array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+       $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  
@@ -89,13 +91,13 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
                        if (!is_record_in_tags($tags, TAG_ACCOUNT, $account['account_code']))
                                continue;
                }       
-               $bal = getPeriods($yr, $mo, $account["account_code"], $dimension, $dimension2);
+               $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 atleast one non-zero account       
+               //Print Type Title if it has at least one non-zero account      
                if (!$printtitle)
                {
                        $printtitle = 1;
@@ -108,11 +110,11 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 
                $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['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 <= 12; $i++)
+               for ($i = 1; $i <= 13; $i++)
                {
                        $rep->AmountCol($i + 1, $i + 2, $balance[$i] * $convert, $dec);
                        $ctotal[$i] += $balance[$i];
@@ -136,8 +138,9 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
                        $rep->NewLine();
                }
 
-               $totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2, $tags);
-               for ($i = 1; $i <= 12; $i++)
+               $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];
                }
@@ -150,11 +153,11 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
                $rep->Line($rep->row);
                $rep->NewLine();
                $rep->TextCol(0, 2,     _('Total') . " " . $typename);
-               for ($i = 1; $i <= 12; $i++)
+               for ($i = 1; $i <= 13; $i++)
                        $rep->AmountCol($i + 1, $i + 2, ($total[$i] + $ctotal[$i]) * $convert, $dec);
                $rep->NewLine();
        }
-       for ($i = 1; $i <= 12; $i++)
+       for ($i = 1; $i <= 13; $i++)
                $totals_arr[$i] = $total[$i] + $ctotal[$i];     
        return $totals_arr;
 }
@@ -167,6 +170,7 @@ function print_annual_expense_breakdown()
 
        $dim = get_company_pref('use_dimension');
        $dimension = $dimension2 = 0;
+       $thousands = 0;
 
        if ($dim == 2)
        {
@@ -176,7 +180,8 @@ function print_annual_expense_breakdown()
                $tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1);
                $comments = $_POST['PARAM_4'];
                $orientation = $_POST['PARAM_5'];
-               $destination = $_POST['PARAM_6'];
+               $thousands = $_POST['PARAM_6'];
+               $destination = $_POST['PARAM_7'];
        }
        elseif ($dim == 1)
        {
@@ -185,7 +190,8 @@ function print_annual_expense_breakdown()
                $tags = (isset($_POST['PARAM_2']) ? $_POST['PARAM_2'] : -1);
                $comments = $_POST['PARAM_3'];
                $orientation = $_POST['PARAM_4'];
-               $destination = $_POST['PARAM_5'];
+               $thousands = $_POST['PARAM_5'];
+               $destination = $_POST['PARAM_6'];
        }
        else
        {
@@ -193,7 +199,8 @@ function print_annual_expense_breakdown()
                $tags = (isset($_POST['PARAM_1']) ? $_POST['PARAM_1'] : -1);
                $comments = $_POST['PARAM_2'];
                $orientation = $_POST['PARAM_3'];
-               $destination = $_POST['PARAM_4'];
+               $thousands = $_POST['PARAM_4'];
+               $destination = $_POST['PARAM_5'];
        }
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
@@ -201,10 +208,23 @@ function print_annual_expense_breakdown()
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $orientation = ($orientation ? 'L' : 'P');
-       $dec = 1;
+       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, 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-
+       $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-
 
        // from now
        $sql = "SELECT begin, end, YEAR(end) AS yr, MONTH(end) AS mo FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year);
@@ -233,10 +253,10 @@ function print_annual_expense_breakdown()
        $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)
     {
@@ -248,8 +268,7 @@ function print_annual_expense_breakdown()
                        3 => array('text' => _("Dimension")." 2",
                                'from' => get_dimension_string($dimension2), 'to' => ''),
                        4 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
-                       5 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       5 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
     elseif ($dim == 1)
     {
@@ -259,8 +278,7 @@ function print_annual_expense_breakdown()
                        2 => array('text' => _('Dimension'),
                                'from' => get_dimension_string($dimension), 'to' => ''),
                        3 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
-                       4 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       4 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
     else
     {
@@ -268,24 +286,30 @@ function print_annual_expense_breakdown()
                        1 => array('text' => _("Year"),
                                'from' => $year, 'to' => ''),
                        2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''),    
-                       3 => array('text' => _('Info'), 'from' => _('Amounts in thousands'),
-                               'to' => ''));
+                       3 => array('text' => _('Info'), 'from' => $amts_thousands, 'to' => ''));
     }
 
-       $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), 9, $orientation);
-    if ($orientation == 'L')
+       $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 <= 16; $i++)
+                       $cols[$i] -= 17;
+       }
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();
 
-       $sales = Array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+       $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))
        {
-               $ctotal = Array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+               $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      
@@ -298,9 +322,9 @@ function print_annual_expense_breakdown()
                $typeresult = get_account_types(false, $class['cid'], -1);
                while ($accounttype=db_fetch($typeresult))
                {
-                       $classtotal = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, 
-                               $dimension2, $tags);
-                       for ($i = 1; $i <= 12; $i++)
+                       $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];
                }
                
@@ -310,7 +334,7 @@ function print_annual_expense_breakdown()
                $rep->NewLine();
                $rep->Font('bold');
                $rep->TextCol(0, 2,     _('Total') . " " . $class["class_name"]);
-               for ($i = 1; $i <= 12; $i++)
+               for ($i = 1; $i <= 13; $i++)
                {
                        $rep->AmountCol($i + 1, $i + 2, $ctotal[$i] * $convert, $dec);
                        $sales[$i] += $ctotal[$i];
@@ -320,7 +344,7 @@ function print_annual_expense_breakdown()
        }
        $rep->Font('bold');     
        $rep->TextCol(0, 2,     _("Calculated Return"));
-       for ($i = 1; $i <= 12; $i++)
+       for ($i = 1; $i <= 13; $i++)
                $rep->AmountCol($i + 1, $i + 2, $sales[$i] * -1, $dec);
        $rep->Font();
        $rep->NewLine();

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index fabb1100d02a4855191a431b6971d6c84b243437..75a3b0f00edb88c46f77d29bf6293bab36738cc2 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -407,6 +407,7 @@ if ($dim == 2)
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
+                       _('Amounts in thousands') => 'YES_NO',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
@@ -459,6 +460,7 @@ elseif ($dim == 1)
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
+                       _('Amounts in thousands') => 'YES_NO',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',
@@ -506,6 +508,7 @@ else
                        _('Account Tags') =>  'ACCOUNTTAGS',
                        _('Comments') => 'TEXTBOX',
                        _('Orientation') => 'ORIENTATION',
+                       _('Amounts in thousands') => 'YES_NO',
                        _('Destination') => 'DESTINATION'));
        $reports->addReport(RC_GL, 706, _('&Balance Sheet'),
        array(  _('Start Date') => 'DATEBEGIN',