Changes up to 2.3.7 merged into unstable branch.

[fa-stable.git] / gl / inquiry / gl_trial_balance.php

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 62f8db1762419c49717f22a9d1df74571c1097a0..1f6545c9ded2b3983e14aa736141ceeeedb63181 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -74,7 +74,7 @@ function display_trial_balance($type, $typename)
        //Get Accounts directly under this group/type
        $accounts = get_gl_accounts(null, null, $type);
 
-       $begin = begin_fiscalyear();
+       $begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
        if (date1_greater_date2($begin, $_POST['TransFromDate']))
                $begin = $_POST['TransFromDate'];
        $begin = add_days($begin, -1);
@@ -85,7 +85,7 @@ function display_trial_balance($type, $typename)
                if (!$printtitle)
                {
                        start_row("class='inquirybg' style='font-weight:bold'");
-                       label_cell("Group - ".$type ." - ".$typename, "colspan=8");
+                       label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
                        end_row();
                        $printtitle = 1;
                }
@@ -137,9 +137,10 @@ function display_trial_balance($type, $typename)
                if (!$printtitle)
                {
                        start_row("class='inquirybg' style='font-weight:bold'");
-                       label_cell("Group - ".$type ." - ".$typename, "colspan=8");
+                       label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
                        end_row();
                        $printtitle = 1;
+
                }
                display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');
        }
@@ -188,7 +189,7 @@ $classresult = get_account_classes(false);
 while ($class = db_fetch($classresult))
 {
        start_row("class='inquirybg' style='font-weight:bold'");
-       label_cell("Class - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");
+       label_cell(_("Class")." - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");
        end_row();
 
        //Get Account groups/types under this group/type with no parents