X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=b8ad34fe9685111a61899d1f65b28792ba8e0a9d;hb=63ed17b5a7a6436c148adc545f3df532b30b493f;hp=62f8db1762419c49717f22a9d1df74571c1097a0;hpb=76ca9fef9bb510236a6a7740fa0f60eb7db384c9;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 62f8db17..b8ad34fe 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);
@@ -46,7 +46,12 @@ function gl_inquiry_controls()
 
     start_table(TABLESTYLE_NOBORDER);
 
-    date_cells(_("From:"), 'TransFromDate', '', null, -30);
+	$date = today();
+	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)
 		dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
@@ -64,17 +69,17 @@ function gl_inquiry_controls()
 
 function display_trial_balance($type, $typename)
 {
-	global $path_to_root;
+	global $path_to_root, $SysPrefs,
+		 $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
 
-	global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
-	$printtitle = 0; //Flag for printing type name		
+	$printtitle = 0; //Flag for printing type name
 
 	$k = 0;
 
 	//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']);
 	if (date1_greater_date2($begin, $_POST['TransFromDate']))
 		$begin = $_POST['TransFromDate'];
 	$begin = add_days($begin, -1);
@@ -85,11 +90,20 @@ 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;
 		}
 
+		// 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);
@@ -110,12 +124,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'];
@@ -137,9 +151,10 @@ 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;
+
 		}
 		display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');
 	}
@@ -188,7 +203,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
@@ -230,5 +245,3 @@ while ($class = db_fetch($classresult))
 
 end_page();
 
-?>
-