X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=gl%2Finquiry%2Fbank_inquiry.php;h=dddc9b47d808e36c570d73bad34e22e5f8acfd23;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=d45570c95fbd59e010b8ae9ece5e377b9cf6dfb3;hpb=3626626c1d1497affa0e1b1f7da41c656e78a385;p=fa-stable.git
diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index d45570c9..dddc9b47 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");
@@ -16,74 +25,62 @@ if ($use_popup_windows)
$js .= get_js_open_window(800, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Bank Statement"), false, false, "", $js);
+page(_($help_context = "Bank Statement"), false, false, "", $js);
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
//-----------------------------------------------------------------------------------
// Ajax updates
//
-if (get_post('Show'))
+if (get_post('Show'))
{
$Ajax->activate('trans_tbl');
}
//------------------------------------------------------------------------------------------------
start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
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();
//------------------------------------------------------------------------------------------------
-
-$date_after = date2sql($_POST['TransAfterDate']);
-$date_to = date2sql($_POST['TransToDate']);
if (!isset($_POST['bank_account']))
$_POST['bank_account'] = "";
-$sql = "SELECT ".TB_PREF."bank_trans.*,name AS BankTransType FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_trans_types
- WHERE ".TB_PREF."bank_trans.bank_act = '" . $_POST['bank_account'] . "'
- AND trans_date >= '$date_after'
- AND trans_date <= '$date_to'
- AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
- ORDER BY trans_date,".TB_PREF."bank_trans.id";
-$result = db_query($sql,"The transactions for '" . $_POST['bank_account'] . "' could not be retrieved");
+$result = get_bank_trans_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate'], $_POST['TransToDate']);
+div_start('trans_tbl');
$act = get_bank_account($_POST["bank_account"]);
display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
-div_start('trans_tbl');
-start_table($table_style);
+start_table(TABLESTYLE);
-$th = array(_("Type"), _("#"), _("Reference"), _("Type"), _("Date"),
+$th = array(_("Type"), _("#"), _("Reference"), _("Date"),
_("Debit"), _("Credit"), _("Balance"), _("Person/Item"), "");
-table_header($th);
+table_header($th);
-$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='" . $_POST['bank_account'] . "'
- AND trans_date < '$date_after'";
-$before_qty = db_query($sql, "The starting balance on hand could not be calculated");
+$bfw = get_balance_before_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate']);
start_row("class='inquirybg'");
-label_cell(""._("Opening Balance")." - ".$_POST['TransAfterDate']."", "colspan=5");
-$bfw_row = db_fetch_row($before_qty);
-$bfw = $bfw_row[0];
+label_cell(""._("Opening Balance")." - ".$_POST['TransAfterDate']."", "colspan=4");
display_debit_or_credit_cells($bfw);
label_cell("");
+label_cell("", "colspan=2");
end_row();
$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);
@@ -91,30 +88,30 @@ 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($myrow["BankTransType"]);
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();
if ($j == 12)
{
$j = 1;
- table_header($th);
+ table_header($th);
}
$j++;
}
//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();