From: Maxime Bourget <bmx007@gmail.com>
Date: Thu, 2 May 2013 20:04:22 +0000 (+0100)
Subject: Option in config file to exclude balanced transactions for past years from Brought... 
X-Git-Tag: 2.3-final~258
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=8cb19b5d344851e9aa17c642715fa4b20791029a

Option in config file to exclude balanced transactions for past years from Brought forward column in Trial Balance.
---

diff --git a/config.default.php b/config.default.php
index d952c54c..5dfa4fee 100644
--- a/config.default.php
+++ b/config.default.php
@@ -285,4 +285,11 @@ $dflt_xr_provider = 0;
 	Optional sorting new sales documents lines according to item code
 */
 $sort_sales_items = false;
+
+/*
+	Trial Balance opening balance presentation option.
+	When set to true past years part of opening balance is cleared.
+*/
+$clear_trial_balance_opening = false;
+
 ?>
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 40456a13..0ca22c2e 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -69,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		
@@ -85,7 +85,7 @@ function display_trial_balance($type, $typename)
 	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	
@@ -97,6 +97,15 @@ function display_trial_balance($type, $typename)
 			$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);
@@ -117,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'];
diff --git a/reporting/rep708.php b/reporting/rep708.php
index 8aba3eb1..8ab1ef16 100644
--- a/reporting/rep708.php
+++ b/reporting/rep708.php
@@ -31,7 +31,7 @@ $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
 
 function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balances, $dimension, $dimension2)
 {
-	global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
+	global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal, $clear_trial_balance_opening;
 	
 	$printtitle = 0; //Flag for printing type name	
 	
@@ -55,6 +55,15 @@ function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balan
 			$rep->NewLine();			
 		}
 		
+		// 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"], $dimension, $dimension2, $begin,  $begin, false, true);
+			$offset = min($open['debit'], $open['credit']);
+		} else
+			$offset = 0;
+
 		$prev = get_balance($account["account_code"], $dimension, $dimension2, $begin, $from, false, false);
 		$curr = get_balance($account["account_code"], $dimension, $dimension2, $from, $to, true, true);
 		$tot = get_balance($account["account_code"], $dimension, $dimension2, $begin, $to, false, true);
@@ -80,18 +89,18 @@ function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balan
 		}
 		else
 		{
-			$rep->AmountCol(2, 3, $prev['debit'], $dec);
-			$rep->AmountCol(3, 4, $prev['credit'], $dec);
+			$rep->AmountCol(2, 3, $prev['debit']-$offset, $dec);
+			$rep->AmountCol(3, 4, $prev['credit']-$offset, $dec);
 			$rep->AmountCol(4, 5, $curr['debit'], $dec);
 			$rep->AmountCol(5, 6, $curr['credit'], $dec);
-			$rep->AmountCol(6, 7, $tot['debit'], $dec);
-			$rep->AmountCol(7, 8, $tot['credit'], $dec);
-			$pdeb += $prev['debit'];
-			$pcre += $prev['credit'];
+			$rep->AmountCol(6, 7, $tot['debit']-$offset, $dec);
+			$rep->AmountCol(7, 8, $tot['credit']-$offset, $dec);
+			$pdeb += $prev['debit']-$offset;
+			$pcre += $prev['credit']-$offset;
 			$cdeb += $curr['debit'];
 			$ccre += $curr['credit'];
-			$tdeb += $tot['debit'];
-			$tcre += $tot['credit'];
+			$tdeb += $tot['debit']-$offset;
+			$tcre += $tot['credit']-$offset;
 		}	
 
 		$pbal += $prev['balance'];