X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_account_inquiry.php;h=3c415566d36937102ecfd4a73f02337dc634fd72;hb=45a035785b9a820621da56dec93078b3ccd9832e;hp=0b0c2709a93ee5aa5e69163e376eeeb16d83fdc7;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php index 0b0c2709..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"); @@ -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"]; @@ -50,7 +65,7 @@ function gl_inquiry_controls() date_cells(_("from:"), 'TransFromDate', '', null, -30); date_cells(_("to:"), 'TransToDate'); - submit_cells('Show',_("Show")); + submit_cells('Show',_("Show"),'','', 'default'); end_row(); @@ -67,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; @@ -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; @@ -128,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_']); @@ -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(); } //----------------------------------------------------------------------------------------------------