Merging latest changes from stable branch up to 2.3.24

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

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 7cf8f8fc7c2f226c036eba7df04e05b53466811a..c9b3fd1ac201d9e77aa58c52bef63098354e4038 100644 (file)
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -163,7 +163,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 
 function print_annual_expense_breakdown()
 {
-       global $path_to_root, $date_system;
+       global $path_to_root, $SysPrefs;
 
        $dim = get_company_pref('use_dimension');
        $dimension = $dimension2 = 0;
@@ -218,9 +218,9 @@ function print_annual_expense_breakdown()
        $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);
-       elseif ($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));
@@ -278,6 +278,7 @@ function print_annual_expense_breakdown()
        $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
        recalculate_cols($cols);
+
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns);
        $rep->NewPage();
@@ -331,4 +332,3 @@ function print_annual_expense_breakdown()
        $rep->End();
 }
 
-?>
\ No newline at end of file