X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=642db5efcda8eaabf5969d435b5e34dcb2adfb31;hb=12e17bf9bcf8e8f56d72aeeb6dde817d1d921615;hp=eab22259592a7483107f89e08aa7d1c5a02cb5f9;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git
diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index eab22259..642db5ef 100644
--- a/gl/inquiry/bank_inquiry.php
+++ b/gl/inquiry/bank_inquiry.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 8;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@ -20,18 +29,24 @@ page(_("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'))
+{
+ $Ajax->activate('trans_tbl');
+}
//------------------------------------------------------------------------------------------------
start_form();
-
start_table("class='tablestyle_noborder'");
start_row();
bank_accounts_list_cells(_("Account:"), 'bank_account', null);
-date_cells(_("From:"), 'TransAfterDate', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -30);
date_cells(_("To:"), 'TransToDate');
-submit_cells('Show',_("Show"));
+submit_cells('Show',_("Show"),'','', true);
end_row();
end_table();
end_form();
@@ -43,30 +58,30 @@ $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");
+div_start('trans_tbl');
$act = get_bank_account($_POST["bank_account"]);
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);
+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");
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);
@@ -76,7 +91,7 @@ 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);
@@ -87,7 +102,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);
@@ -98,19 +112,19 @@ while ($myrow = db_fetch($result))
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("");
end_row();
end_table(2);
-
+div_end();
//------------------------------------------------------------------------------------------------
end_page();