Implemented journal entries with multiply virtual AR/AP subaccounts.

[fa-stable.git] / gl / inquiry / bank_inquiry.php

diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index dddc9b47d808e36c570d73bad34e22e5f8acfd23..30380989c73ab95a6a557a55b34587a00e95dfa2 100644 (file)
--- 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,6 +38,9 @@ if (get_post('Show'))
 }
 //------------------------------------------------------------------------------------------------
 
+if (isset($_GET['bank_account']))
+       $_POST['bank_account'] = $_GET['bank_account'];
+
 start_form();
 start_table(TABLESTYLE_NOBORDER);
 start_row();
@@ -70,14 +73,19 @@ table_header($th);
 
 $bfw = get_balance_before_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate']);
 
-start_row("class='inquirybg'");
-label_cell("<b>"._("Opening Balance")." - ".$_POST['TransAfterDate']."</b>", "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,13 @@ 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_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 +119,12 @@ while ($myrow = db_fetch($result))
 }
 //end of while loop
 
-start_row("class='inquirybg'");
-label_cell("<b>" . _("Ending Balance")." - ". $_POST['TransToDate']. "</b>", "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();