Option in config file to exclude balanced transactions for past years from Brought...

[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 e4228cb2beb4180e8688c10dcbf7ca708c046654..0ca22c2e5bc592f2f45e8ffd4cb4f98bf95b359b 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -46,7 +46,12 @@ function gl_inquiry_controls()
 
     start_table(TABLESTYLE_NOBORDER);
 
-    date_cells(_("From:"), 'TransFromDate', '', null, -30);
+       $date = today();
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = begin_month($date);
+       if (!isset($_POST['TransToDate']))
+               $_POST['TransToDate'] = end_month($date);
+    date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        if ($dim >= 1)
                dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
@@ -64,7 +69,7 @@ function gl_inquiry_controls()
 
 function display_trial_balance($type, $typename)
 {
-       global $path_to_root;
+       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          
@@ -75,22 +80,32 @@ 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']);
+       //$begin = begin_fiscalyear();
        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");
+                       label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
                        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)
+               {
+                       $open = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin,  $begin, false, true);
+                       $offset = min($open['debit'], $open['credit']);
+               } else
+                       $offset = 0;
+
                $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);
@@ -111,12 +126,12 @@ function display_trial_balance($type, $typename)
                }
                else
                {
-                       amount_cell($prev['debit']);
-                       amount_cell($prev['credit']);
+                       amount_cell($prev['debit']-$offset);
+                       amount_cell($prev['credit']-$offset);
                        amount_cell($curr['debit']);
                        amount_cell($curr['credit']);
-                       amount_cell($tot['debit']);
-                       amount_cell($tot['credit']);
+                       amount_cell($tot['debit']-$offset);
+                       amount_cell($tot['credit']-$offset);
                        $pdeb += $prev['debit'];
                        $pcre += $prev['credit'];
                        $cdeb += $curr['debit'];
@@ -138,7 +153,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;                
                }
@@ -189,7 +204,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