X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=22b31a7807f89bfa50926211b7271f9d595495e0;hb=e41d9f32739a4d895138feb772f7dccdde312dbd;hp=94ef03bf91a706c5d643d97a7a0e94c219bcdfef;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 94ef03bf..22b31a78 100644
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 8;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@ -11,13 +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"];
@@ -35,20 +53,20 @@ if (isset($_GET["Dimension2"]))
function gl_inquiry_controls()
{
global $table_style2;
-
+
$dim = get_company_pref('use_dimension');
start_form();
//start_table($table_style2);
start_table("class='tablestyle_noborder'");
start_row();
-
+
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"),'','', true);
+
end_row();
if ($dim >= 1)
@@ -56,7 +74,7 @@ function gl_inquiry_controls()
if ($dim > 1)
dimensions_list_row(_("Dimension")." 2", 'Dimension2', null, true, " ", false, 2);
end_table();
-
+
end_form();
}
@@ -79,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);
@@ -95,23 +109,34 @@ function show_results()
else if ($dim == 1)
$th = array(_("Type"), _("#"), _("Date"), _("Dimension"),
_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
- else
- $th = array(_("Type"), _("#"), _("Date"),
+ else
+ $th = array(_("Type"), _("#"), _("Date"),
_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
table_header($th);
- $bfw = get_gl_balance_from_to("", $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
+ if (is_account_balancesheet($_POST["account"]))
+ $begin = "";
+ else
+ {
+ $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']);
start_row("class='inquirybg'");
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;
$j = 1;
$k = 0; //row colour counter
- while ($myrow = db_fetch($result))
+ while ($myrow = db_fetch($result))
{
alt_table_row_color($k);
@@ -135,8 +160,8 @@ function show_results()
$j++;
if ($j == 12)
- {
- $j = 1;
+ {
+ $j = 1;
table_header($th);
}
}
@@ -146,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();
}
//----------------------------------------------------------------------------------------------------