X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=969cfcca0dd6c8030c6877e3afe950de87456d16;hb=4d5c386a745f07e2f937c5a3fcfffdb431551cc5;hp=8a6ba2f9c1c65ec251fb70a53a52d6549fb91f6f;hpb=11e9442de571f17b91078e2af73594c0806ead5a;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 8a6ba2f9..969cfcca 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -18,6 +18,12 @@ if ($use_date_picker)
 page(_("Trial Balance"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('Show')) 
+{
+	$Ajax->activate('balance_tbl');
+}
 
 
 function gl_inquiry_controls()
@@ -26,11 +32,11 @@ function gl_inquiry_controls()
 
     start_table("class='tablestyle_noborder'");
 
-    date_cells(_("From:"), 'TransFromDate', null, -30);
+    date_cells(_("From:"), 'TransFromDate', '', null, -30);
 	date_cells(_("To:"), 'TransToDate');
 	check_cells(_("No zero values"), 'NoZero', null);
 
-    submit_cells('Show',_("Show"));
+	submit_cells('Show',_("Show"),'','', true);
     end_table();
     end_form();
 }
@@ -72,6 +78,7 @@ function display_trial_balance()
 {
 	global $table_style, $path_to_root;
 
+	div_start('balance_tbl');
 	start_table($table_style);
 	$tableheader =  "<tr>
         <td rowspan=2 class='tableheader'>" . _("Account") . "</td>
@@ -92,6 +99,7 @@ function display_trial_balance()
 
 	$k = 0;
 
+	$totprev = $totcurr = 0.0;
 	$accounts = get_gl_accounts();
 
 	while ($account = db_fetch($accounts))
@@ -101,7 +109,7 @@ function display_trial_balance()
 		else
 		{
 			$begin = begin_fiscalyear();
-			if ($_POST['TransFromDate'] < $begin)
+			if (date1_greater_date2($begin, $_POST['TransFromDate']))
 				$begin = $_POST['TransFromDate'];
 			$begin = add_days($begin, -1);
 		}
@@ -110,6 +118,8 @@ function display_trial_balance()
 		$curr_balance = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate']);
 		if (check_value("NoZero") && !$prev_balance && !$curr_balance)
 			continue;
+		$totprev += $prev_balance;
+		$totcurr += $curr_balance;
 		alt_table_row_color($k);
 
 		$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?" . SID . "TransFromDate=" . $_POST["TransFromDate"] . "&TransToDate=" . $_POST["TransToDate"] . "&account=" . $account["account_code"] . "'>" . $account["account_code"] . "</a>";
@@ -122,9 +132,15 @@ function display_trial_balance()
 		display_debit_or_credit_cells($prev_balance + $curr_balance);
 		end_row();
 	}
+	start_row("class='inquirybg'");
+	label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=2");
+	display_debit_or_credit_cells($totprev);
+	display_debit_or_credit_cells($totcurr);
+	display_debit_or_credit_cells($totprev + $totcurr);
+	end_row();
 
 	end_table(1);
-
+	div_end();
 }
 
 //----------------------------------------------------------------------------------------------------