Merged last changes from stable.

[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 0ca22c2e5bc592f2f45e8ffd4cb4f98bf95b359b..bfb6a5477b2ba862a0c1361934c472a6304d1cc2 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -47,10 +47,10 @@ function gl_inquiry_controls()
     start_table(TABLESTYLE_NOBORDER);
 
        $date = today();
-       if (!isset($_POST['TransFromDate']))
-               $_POST['TransFromDate'] = begin_month($date);
        if (!isset($_POST['TransToDate']))
                $_POST['TransToDate'] = end_month($date);
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = add_days(end_month($date), -$_SESSION["wa_current_user"]->prefs->transaction_days());
     date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        if ($dim >= 1)
@@ -69,19 +69,17 @@ function gl_inquiry_controls()
 
 function display_trial_balance($type, $typename)
 {
-       global $path_to_root, $clear_trial_balance_opening;
-       
-       global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
-       $printtitle = 0; //Flag for printing type name          
+       global $path_to_root, $clear_trial_balance_opening,
+                $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);         
-       
+       $accounts = get_gl_accounts(null, null, $type);
+
        $begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
-       //$begin = begin_fiscalyear();
        if (date1_greater_date2($begin, $_POST['TransFromDate']))
                $begin = $_POST['TransFromDate'];
        $begin = add_days($begin, -1);
@@ -90,13 +88,13 @@ function display_trial_balance($type, $typename)
        {
                //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;                
-               }       
-       
+                       end_row();
+                       $printtitle = 1;
+               }
+
                // FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null.
                // If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures.
                if (@$clear_trial_balance_opening)
@@ -122,7 +120,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
                {
@@ -154,8 +152,9 @@ function display_trial_balance($type, $typename)
                {
                        start_row("class='inquirybg' style='font-weight:bold'");
                        label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
-                       end_row();              
-                       $printtitle = 1;                
+                       end_row();
+                       $printtitle = 1;
+
                }
                display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');
        }
@@ -173,8 +172,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;