X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=17a889075211ed8a028c70609ac125b7edae04b8;hb=ac93b30fdf9beabafa02a577a0f7db62eb703672;hp=e91a59b2d985f1f5905e57b1bf2986b8929c0ae8;hpb=1a2a0326b84927ccaaf01b52f0d3e97d7b782f47;p=fa-stable.git
diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index e91a59b2..17a88907 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_GLTRANSVIEW';
+$path_to_root = "../..";
include_once($path_to_root . "/includes/session.inc");
@@ -21,6 +30,12 @@ if ($use_date_picker)
page(_("General Ledger Account Inquiry"), false, false, '', $js);
//----------------------------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('Show'))
+{
+ $Ajax->activate('trans_tbl');
+}
if (isset($_GET["account"]))
$_POST["account"] = $_GET["account"];
@@ -48,9 +63,9 @@ function gl_inquiry_controls()
gl_all_accounts_list_cells(_("Account:"), 'account', null);
- date_cells(_("from:"), 'TransFromDate', null, -30);
+ date_cells(_("from:"), 'TransFromDate', '', null, -30);
date_cells(_("to:"), 'TransToDate');
- submit_cells('Show',_("Show"));
+ submit_cells('Show',_("Show"),'','', 'default');
end_row();
@@ -83,6 +98,7 @@ function show_results()
$_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
$colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
+ div_start('trans_tbl');
//echo "\nDimension =". $_POST['Dimension'];
display_heading($_POST["account"]. " ".$act_name);
@@ -102,7 +118,7 @@ function show_results()
else
{
$begin = begin_fiscalyear();
- if ($_POST['TransFromDate'] < $begin)
+ if (date1_greater_date2($begin, $_POST['TransFromDate']))
$begin = $_POST['TransFromDate'];
$begin = add_days($begin, -1);
}
@@ -113,6 +129,7 @@ function show_results()
label_cell(""._("Opening Balance")." - ".$_POST['TransFromDate']."", "colspan=$colspan");
display_debit_or_credit_cells($bfw);
label_cell("");
+ label_cell("");
end_row();
//$running_total =0;
$running_total = $bfw;
@@ -154,11 +171,13 @@ function show_results()
label_cell("" . _("Ending Balance") ." - ".$_POST['TransToDate']. "", "colspan=$colspan");
display_debit_or_credit_cells($running_total);
label_cell("");
+ label_cell("");
end_row();
end_table(2);
if (db_num_rows($result) == 0)
display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
+ div_end();
}
//----------------------------------------------------------------------------------------------------