X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=e287d77bfcad714654a60b0ba8a64fae550c30cd;hb=ac93b30fdf9beabafa02a577a0f7db62eb703672;hp=f6ffdba757a156d37ee6bb207f94a5ac2e18ff54;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index f6ffdba7..e287d77b 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();
@@ -49,11 +58,10 @@ $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
+$sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans
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");
@@ -64,7 +72,7 @@ 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);
@@ -73,11 +81,12 @@ $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='" . $_POST
$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;
@@ -94,7 +103,6 @@ while ($myrow = db_fetch($result))
label_cell(systypes::name($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);
@@ -112,9 +120,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();