X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=33112d70d3632651d6d251a00d73ff1677d5414c;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=d5147f5ff1ecc624ff4fa66ef9b1e1c7534c8574;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index d5147f5f..33112d70 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -1,6 +1,15 @@ . +***********************************************************************/ +$page_security = 'SA_BANKTRANSVIEW'; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -37,7 +46,7 @@ bank_accounts_list_cells(_("Account:"), 'bank_account', null); date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate'); -submit_cells('Show',_("Show"),'','', true); +submit_cells('Show',_("Show"),'','', 'default'); end_row(); end_table(); end_form(); @@ -50,7 +59,7 @@ $date_to = date2sql($_POST['TransToDate']); if (!isset($_POST['bank_account'])) $_POST['bank_account'] = ""; $sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans - WHERE ".TB_PREF."bank_trans.bank_act = '" . $_POST['bank_account'] . "' + WHERE ".TB_PREF."bank_trans.bank_act = ".db_escape($_POST['bank_account']) . " AND trans_date >= '$date_after' AND trans_date <= '$date_to' ORDER BY trans_date,".TB_PREF."bank_trans.id"; @@ -63,20 +72,22 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); start_table($table_style); -$th = array(_("Type"), _("#"), _("Reference"), _("Type"), _("Date"), +$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), ""); table_header($th); -$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='" . $_POST['bank_account'] . "' +$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act=" + .db_escape($_POST['bank_account']) . " AND trans_date < '$date_after'"; $before_qty = db_query($sql, "The starting balance on hand could not be calculated"); start_row("class='inquirybg'"); -label_cell(""._("Opening Balance")." - ".$_POST['TransAfterDate']."", "colspan=5"); +label_cell(""._("Opening Balance")." - ".$_POST['TransAfterDate']."", "colspan=4"); $bfw_row = db_fetch_row($before_qty); $bfw = $bfw_row[0]; display_debit_or_credit_cells($bfw); label_cell(""); +label_cell("", "colspan=2"); end_row(); $running_total = $bfw; @@ -90,13 +101,13 @@ while ($myrow = db_fetch($result)) $running_total += $myrow["amount"]; $trandate = sql2date($myrow["trans_date"]); - label_cell(systypes::name($myrow["type"])); + label_cell($systypes_array[$myrow["type"]]); label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"])); label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"],$myrow['ref'])); label_cell($trandate); display_debit_or_credit_cells($myrow["amount"]); amount_cell($running_total); - 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"])); label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"])); end_row(); @@ -110,9 +121,10 @@ while ($myrow = db_fetch($result)) //end of while loop start_row("class='inquirybg'"); -label_cell("" . _("Ending Balance")." - ". $_POST['TransToDate']. "", "colspan=5"); +label_cell("" . _("Ending Balance")." - ". $_POST['TransToDate']. "", "colspan=4"); display_debit_or_credit_cells($running_total); label_cell(""); +label_cell("", "colspan=2"); end_row(); end_table(2); div_end();