X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=c667c8873641321b2b36ddd685967189aa2fd4f9;hb=0489317205141deaecefe3a7243d11a3e38a51d0;hp=dddc9b47d808e36c570d73bad34e22e5f8acfd23;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git
diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index dddc9b47..c667c887 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(_($help_context = "Bank Statement"), false, false, "", $js);
+page(_($help_context = "Bank Statement"), isset($_GET['bank_account']), false, "", $js);
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
@@ -38,12 +38,15 @@ if (get_post('Show'))
}
//------------------------------------------------------------------------------------------------
+if (isset($_GET['bank_account']))
+ $_POST['bank_account'] = $_GET['bank_account'];
+
start_form();
start_table(TABLESTYLE_NOBORDER);
start_row();
bank_accounts_list_cells(_("Account:"), 'bank_account', null);
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
date_cells(_("To:"), 'TransToDate');
submit_cells('Show',_("Show"),'','', 'default');
@@ -65,19 +68,24 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
start_table(TABLESTYLE);
$th = array(_("Type"), _("#"), _("Reference"), _("Date"),
- _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), "");
+ _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), _("Memo"), "");
table_header($th);
$bfw = get_balance_before_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate']);
-start_row("class='inquirybg'");
-label_cell(""._("Opening Balance")." - ".$_POST['TransAfterDate']."", "colspan=4");
+$credit = $debit = 0;
+start_row("class='inquirybg' style='font-weight:bold'");
+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;
+if ($bfw > 0 )
+ $debit += $bfw;
+else
+ $credit += $bfw;
$j = 1;
$k = 0; //row colour counter
while ($myrow = db_fetch($result))
@@ -94,9 +102,14 @@ while ($myrow = db_fetch($result))
label_cell($trandate);
display_debit_or_credit_cells($myrow["amount"]);
amount_cell($running_total);
- label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
+ label_cell(get_counterparty_name($myrow["type"], $myrow["trans_no"]));
+ label_cell(get_comments_string($myrow["type"], $myrow["trans_no"]));
label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"]));
end_row();
+ if ($myrow["amount"] > 0 )
+ $debit += $myrow["amount"];
+ else
+ $credit += $myrow["amount"];
if ($j == 12)
{
@@ -107,9 +120,12 @@ while ($myrow = db_fetch($result))
}
//end of while loop
-start_row("class='inquirybg'");
-label_cell("" . _("Ending Balance")." - ". $_POST['TransToDate']. "", "colspan=4");
-display_debit_or_credit_cells($running_total);
+start_row("class='inquirybg' style='font-weight:bold'");
+label_cell(_("Ending Balance")." - ". $_POST['TransToDate'], "colspan=4");
+amount_cell($debit);
+amount_cell(-$credit);
+//display_debit_or_credit_cells($running_total);
+amount_cell($debit+$credit);
label_cell("");
label_cell("", "colspan=2");
end_row();