X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=dfdda2f1282be7634cee1aa41aa703228716b24e;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=484ba459f5364dd90155332cee6c0a360641a9d1;hpb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 484ba459..dfdda2f1 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -64,8 +64,8 @@ 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		
 
@@ -90,6 +90,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);
@@ -110,12 +119,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'];