Stable merged into unstable again (due to failure on binary file during previous...

[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 2ab116243bbeb309f770e4bd27d912d839040f88..1f6545c9ded2b3983e14aa736141ceeeedb63181 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -65,32 +65,31 @@ function gl_inquiry_controls()
 function display_trial_balance($type, $typename)
 {
        global $path_to_root;
-       
+
        global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
        $printtitle = 0; //Flag for printing type name          
 
        $k = 0;
 
-       //$accounts = get_gl_accounts();
        //Get Accounts directly under this group/type
-       $accounts = get_gl_accounts(null, null, $type);         
-       
-       $begin = begin_fiscalyear();
+       $accounts = get_gl_accounts(null, null, $type);
+
+       $begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
        if (date1_greater_date2($begin, $_POST['TransFromDate']))
                $begin = $_POST['TransFromDate'];
        $begin = add_days($begin, -1);
-       
+
        while ($account = db_fetch($accounts))
        {
                //Print Type Title if it has atleast one non-zero account       
                if (!$printtitle)
-               {       
+               {
                        start_row("class='inquirybg' style='font-weight:bold'");
-                       label_cell("Group - ".$type ." - ".$typename, "colspan=8");
-                       end_row();              
-                       $printtitle = 1;                
-               }       
-       
+                       label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
+                       end_row();
+                       $printtitle = 1;
+               }
+
                $prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false);
                $curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
                $tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true);
@@ -107,7 +106,7 @@ function display_trial_balance($type, $typename)
                        display_debit_or_credit_cells($prev['balance']);
                        display_debit_or_credit_cells($curr['balance']);
                        display_debit_or_credit_cells($tot['balance']);
-                       
+
                }
                else
                {
@@ -138,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");
-                       end_row();              
-                       $printtitle = 1;                
+                       label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
+                       end_row();
+                       $printtitle = 1;
+
                }
                display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');
        }
@@ -158,8 +158,8 @@ if (isset($_POST['TransFromDate']))
                display_error(_("The from date cannot be bigger than the fiscal year end."));
                set_focus('TransFromDate');
                return;
-       }       
-}      
+       }
+}
 div_start('balance_tbl');
 if (!isset($_POST['Dimension']))
        $_POST['Dimension'] = 0;
@@ -189,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
@@ -223,7 +223,7 @@ while ($class = db_fetch($classresult))
        end_row();
 
        end_table(1);
-       if (($pbal = round2($pbal, user_price_dec()))  != 0)
+       if (($pbal = round2($pbal, user_price_dec())) != 0 && $_POST['Dimension'] == 0 && $_POST['Dimension2'] == 0)
                display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
        div_end();