X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=0ba2443fa876f9535a0492ded41bd34295ff9085;hb=9d9a80a6a4411f42f06a30284b1e6d02277ad992;hp=40456a139d26a50c1afadcbde3fffa7af943a6ab;hpb=183839aff4b89c6be4529ce6cd8a4d1d94194dfd;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 40456a13..0ba2443f 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js = get_js_date_picker();
 
 page(_($help_context = "Trial Balance"), false, false, "", $js);
@@ -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), -user_transaction_days());
     date_cells(_("From:"), 'TransFromDate');
 	date_cells(_("To:"), 'TransToDate');
 	if ($dim >= 1)
@@ -69,34 +69,41 @@ 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		
+	global $path_to_root, $SysPrefs,
+		 $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);
-	
+
 	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;		
-		}	
-	
+			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 (@$SysPrefs->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);
@@ -113,16 +120,16 @@ 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
 		{
-			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'];
@@ -145,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.')');
 	}
@@ -164,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;
@@ -206,9 +214,6 @@ while ($class = db_fetch($classresult))
 	}
 }
 
-	//$prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
-	//$curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
-	//$tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
 	if (!check_value('Balance'))
 	{
 		start_row("class='inquirybg' style='font-weight:bold'");
@@ -237,5 +242,3 @@ while ($class = db_fetch($classresult))
 
 end_page();
 
-?>
-