X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=3c415566d36937102ecfd4a73f02337dc634fd72;hb=76addbf42e148553411cf37bf1284d2cf6082b84;hp=db669563290e841677f734d97941f0bbcd721811;hpb=d683494fb064b081b75616354993bfc889389dc2;p=fa-stable.git
diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index db669563..3c415566 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");
@@ -11,15 +20,22 @@ include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
-$js = get_js_set_focus('account');
+$js = '';
+set_focus('account');
if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("General Ledger Account Inquiry"), false, false, "setFocus()", $js);
+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"];
@@ -47,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();
@@ -66,7 +82,7 @@ function gl_inquiry_controls()
function show_results()
{
- global $path_to_root, $table_style;
+ global $path_to_root, $table_style, $systypes_array;
if (!isset($_POST["account"]) || $_POST["account"] == "")
return;
@@ -81,12 +97,8 @@ function show_results()
$result = get_gl_transactions($_POST['TransFromDate'], $_POST['TransToDate'], -1,
$_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
- if (db_num_rows($result) == 0)
- {
- display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
- return;
- }
$colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
+ div_start('trans_tbl');
//echo "\nDimension =". $_POST['Dimension'];
display_heading($_POST["account"]. " ".$act_name);
@@ -101,14 +113,14 @@ function show_results()
$th = array(_("Type"), _("#"), _("Date"),
_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
table_header($th);
- if (is_account_balancesheet($account["account_code"]))
+ if (is_account_balancesheet($_POST["account"]))
$begin = "";
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);
}
$bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
@@ -117,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;
@@ -132,14 +145,14 @@ function show_results()
$trandate = sql2date($myrow["tran_date"]);
- label_cell(systypes::name($myrow["type"]));
+ label_cell($systypes_array[$myrow["type"]]);
label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true));
label_cell($trandate);
if ($dim >= 1)
label_cell(get_dimension_string($myrow['dimension_id'], true));
if ($dim > 1)
label_cell(get_dimension_string($myrow['dimension2_id'], true));
- label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]));
+ label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
display_debit_or_credit_cells($myrow["amount"]);
amount_cell($running_total);
label_cell($myrow['memo_']);
@@ -158,9 +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();
}
//----------------------------------------------------------------------------------------------------