projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 4817: g/l account inquiry can timeout due to slow sql. @Braath Waate.
[fa-stable.git]
/
gl
/
inquiry
/
bank_inquiry.php
diff --git
a/gl/inquiry/bank_inquiry.php
b/gl/inquiry/bank_inquiry.php
index c667c8873641321b2b36ddd685967189aa2fd4f9..e273099db7fa6dc721723df38cc0b9b2493050ad 100644
(file)
--- a/
gl/inquiry/bank_inquiry.php
+++ b/
gl/inquiry/bank_inquiry.php
@@
-14,6
+14,7
@@
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/data_checks.inc");
@@
-21,11
+22,11
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
include_once($path_to_root . "/includes/banking.inc");
$js = "";
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);
$js .= get_js_open_window(800, 500);
-if (
$use_date_picker
)
+if (
user_use_date_picker()
)
$js .= get_js_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."));
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
@@
-46,7
+47,7
@@
start_table(TABLESTYLE_NOBORDER);
start_row();
bank_accounts_list_cells(_("Account:"), 'bank_account', null);
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');
date_cells(_("To:"), 'TransToDate');
submit_cells('Show',_("Show"),'','', 'default');
@@
-68,7
+69,7
@@
display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
start_table(TABLESTYLE);
$th = array(_("Type"), _("#"), _("Reference"), _("Date"),
start_table(TABLESTYLE);
$th = array(_("Type"), _("#"), _("Reference"), _("Date"),
- _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), _("Memo"), "");
+ _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), _("Memo"), ""
, ""
);
table_header($th);
$bfw = get_balance_before_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate']);
table_header($th);
$bfw = get_balance_before_for_bank_account($_POST['bank_account'], $_POST['TransAfterDate']);
@@
-78,7
+79,7
@@
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(_("Opening Balance")." - ".$_POST['TransAfterDate'], "colspan=4");
display_debit_or_credit_cells($bfw);
label_cell("");
-label_cell("", "colspan=
2
");
+label_cell("", "colspan=
4
");
end_row();
$running_total = $bfw;
end_row();
$running_total = $bfw;
@@
-102,9
+103,14
@@
while ($myrow = db_fetch($result))
label_cell($trandate);
display_debit_or_credit_cells($myrow["amount"]);
amount_cell($running_total);
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"]));
label_cell(get_comments_string($myrow["type"], $myrow["trans_no"]));
label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"]));
+
+ label_cell(trans_editor_link($myrow["type"], $myrow["trans_no"]));
+
end_row();
if ($myrow["amount"] > 0 )
$debit += $myrow["amount"];
end_row();
if ($myrow["amount"] > 0 )
$debit += $myrow["amount"];
@@
-126,8
+132,7
@@
amount_cell($debit);
amount_cell(-$credit);
//display_debit_or_credit_cells($running_total);
amount_cell($debit+$credit);
amount_cell(-$credit);
//display_debit_or_credit_cells($running_total);
amount_cell($debit+$credit);
-label_cell("");
-label_cell("", "colspan=2");
+label_cell("", "colspan=4");
end_row();
end_table(2);
div_end();
end_row();
end_table(2);
div_end();
@@
-135,4
+140,3
@@
div_end();
end_page();
end_page();
-?>