X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fbank_inquiry.php;h=e273099db7fa6dc721723df38cc0b9b2493050ad;hb=f01cb25258d7b619f820d8f78e9bccf4501fc58e;hp=e25e7ba823502ffffd5b9981b1a2bd6cba1a50fd;hpb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;p=fa-stable.git diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index e25e7ba8..e273099d 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -22,11 +22,11 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); include_once($path_to_root . "/includes/banking.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_($help_context = "Bank Statement"), isset($_GET['bank_account']), false, "", $js); +page(_($help_context = "Bank Account Inquiry"), isset($_GET['bank_account']) && !isset($_GET['TransAfterDate']), false, "", $js, false, "", true); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -47,7 +47,7 @@ start_table(TABLESTYLE_NOBORDER); start_row(); bank_accounts_list_cells(_("Account:"), 'bank_account', null); -date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); +date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days()); date_cells(_("To:"), 'TransToDate'); submit_cells('Show',_("Show"),'','', 'default'); @@ -103,7 +103,9 @@ while ($myrow = db_fetch($result)) label_cell($trandate); display_debit_or_credit_cells($myrow["amount"]); amount_cell($running_total); - label_cell(get_counterparty_name($myrow["type"], $myrow["trans_no"])); + + label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"])); + label_cell(get_comments_string($myrow["type"], $myrow["trans_no"])); label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"]));