Release 2.4.13

[fa-stable.git] / reporting / rep705.php

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 80610ad6c70abc4fd3a4798bfcdebe4f670f4887..dfc9208ab47dd1286ebf3a8edde5b8eae6abdb00 100644 (file)
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -110,7 +110,7 @@ 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[pertotal]);
+                       $bal['per09'], $bal['per10'], $bal['per11'], $bal['per12'], $bal['pertotal']);
                $rep->TextCol(0, 1,     $account['account_code']);
                $rep->TextCol(1, 2,     $account['account_name']);
 
@@ -166,7 +166,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 
 function print_annual_expense_breakdown()
 {
-       global $path_to_root, $SysPrefs;
+       global $path_to_root, $SysPrefs, $tmonths;
 
        $dim = get_company_pref('use_dimension');
        $dimension = $dimension2 = 0;
@@ -239,18 +239,18 @@ function print_annual_expense_breakdown()
                list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da);
        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));
-       $per10 = strftime('%b',mktime(0,0,0,$mo-2,$da,$yr));
-       $per09 = strftime('%b',mktime(0,0,0,$mo-3,$da,$yr));
-       $per08 = strftime('%b',mktime(0,0,0,$mo-4,$da,$yr));
-       $per07 = strftime('%b',mktime(0,0,0,$mo-5,$da,$yr));
-       $per06 = strftime('%b',mktime(0,0,0,$mo-6,$da,$yr));
-       $per05 = strftime('%b',mktime(0,0,0,$mo-7,$da,$yr));
-       $per04 = strftime('%b',mktime(0,0,0,$mo-8,$da,$yr));
-       $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));
+       $per12 = $tmonths[date('n',mktime(0,0,0,$mo,$da,$yr))];
+       $per11 = $tmonths[date('n',mktime(0,0,0,$mo-1,$da,$yr))];
+       $per10 = $tmonths[date('n',mktime(0,0,0,$mo-2,$da,$yr))];
+       $per09 = $tmonths[date('n',mktime(0,0,0,$mo-3,$da,$yr))];
+       $per08 = $tmonths[date('n',mktime(0,0,0,$mo-4,$da,$yr))];
+       $per07 = $tmonths[date('n',mktime(0,0,0,$mo-5,$da,$yr))];
+       $per06 = $tmonths[date('n',mktime(0,0,0,$mo-6,$da,$yr))];
+       $per05 = $tmonths[date('n',mktime(0,0,0,$mo-7,$da,$yr))];
+       $per04 = $tmonths[date('n',mktime(0,0,0,$mo-8,$da,$yr))];
+       $per03 = $tmonths[date('n',mktime(0,0,0,$mo-9,$da,$yr))];
+       $per02 = $tmonths[date('n',mktime(0,0,0,$mo-10,$da,$yr))];
+       $per01 = $tmonths[date('n',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, _('Total'));
@@ -296,7 +296,7 @@ function print_annual_expense_breakdown()
        elseif (user_pagesize() == 'A4')
        {
                // Portrait, so adjust columns for A4, 16.7 pts narrower than Letter
-               for ($i = 2; $i <= 16; $i++)
+               for ($i = 2; $i < sizeof($cols); $i++)
                        $cols[$i] -= 17;
        }