X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=dddc9b47d808e36c570d73bad34e22e5f8acfd23;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=33112d70d3632651d6d251a00d73ff1677d5414c;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index 33112d70..dddc9b47 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -25,7 +25,7 @@ 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.")); @@ -39,7 +39,7 @@ if (get_post('Show')) //------------------------------------------------------------------------------------------------ start_form(); -start_table("class='tablestyle_noborder'"); +start_table(TABLESTYLE_NOBORDER); start_row(); bank_accounts_list_cells(_("Account:"), 'bank_account', null); @@ -53,38 +53,25 @@ 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.* FROM ".TB_PREF."bank_trans - 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"; -$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']); -start_table($table_style); +start_table(TABLESTYLE); $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=" - .db_escape($_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=4"); -$bfw_row = db_fetch_row($before_qty); -$bfw = $bfw_row[0]; display_debit_or_credit_cells($bfw); label_cell(""); label_cell("", "colspan=2");