X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=969cfcca0dd6c8030c6877e3afe950de87456d16;hb=4d5c386a745f07e2f937c5a3fcfffdb431551cc5;hp=4ab7a46512a99684cee31b522d1f5ec4ca5cdb3a;hpb=d683494fb064b081b75616354993bfc889389dc2;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 4ab7a465..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 = "
@@ -92,6 +99,7 @@ function display_trial_balance()
$k = 0;
+ $totprev = $totcurr = 0.0;
$accounts = get_gl_accounts();
while ($account = db_fetch($accounts))
@@ -100,16 +108,18 @@ function display_trial_balance()
$begin = null;
else
{
- if ($from < $begin)
- $begin = add_days($_POST['TransFromDate'], -1);
- else
- $begin = add_days(begin_fiscalyear(), -1);
+ $begin = begin_fiscalyear();
+ if (date1_greater_date2($begin, $_POST['TransFromDate']))
+ $begin = $_POST['TransFromDate'];
+ $begin = add_days($begin, -1);
}
$prev_balance = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
$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 = "" . $account["account_code"] . "";
@@ -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("" . _("Ending Balance") ." - ".$_POST['TransToDate']. "", "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();
}
//----------------------------------------------------------------------------------------------------