From 8adc648cb5a861b42bd32d0ceae4cfd808b0d12c Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 26 Aug 2018 18:57:14 +0200 Subject: [PATCH] Bug 4601: memo line not cleared after enter new payment item Inbox. @Braathwaate. --- gl/gl_bank.php | 16 ++++++++++------ gl/includes/ui/gl_bank_ui.inc | 7 ++----- gl/inquiry/bank_inquiry.php | 2 +- includes/dashboard.inc | 2 +- includes/ui/ui_input.inc | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/gl/gl_bank.php b/gl/gl_bank.php index 71e2c045..2d446531 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -60,11 +60,15 @@ if (list_updated('PersonDetailID')) { //-------------------------------------------------------------------------------------------------- function line_start_focus() { - global $Ajax; - - $Ajax->activate('items_table'); - $Ajax->activate('footer'); - set_focus('_code_id_edit'); + global $Ajax; + + unset($_POST['amount']); + unset($_POST['dimension_id']); + unset($_POST['dimension2_id']); + unset($_POST['LineMemo']); + $Ajax->activate('items_table'); + $Ajax->activate('footer'); + set_focus('_code_id_edit'); } //----------------------------------------------------------------------------------------------- @@ -380,7 +384,7 @@ if (isset($_POST['AddItem'])) if (isset($_POST['UpdateItem'])) handle_update_item(); -if (isset($_POST['CancelItemChanges'])) +if (isset($_POST['CancelItemChanges']) || isset($_POST['Index'])) line_start_focus(); if (isset($_POST['go'])) diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc index 86a17bcd..34a4fed9 100644 --- a/gl/includes/ui/gl_bank_ui.inc +++ b/gl/includes/ui/gl_bank_ui.inc @@ -222,9 +222,6 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) } else { - $_POST['amount'] = price_format(0); - $_POST['dimension_id'] = 0; - $_POST['dimension2_id'] = 0; if(isset($_POST['_code_id_update'])) { $Ajax->activate('code_id'); } @@ -246,8 +243,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['code_id'] = get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act'); } - $Ajax->activate('dimension_id'); - $Ajax->activate('dimension2_id'); + $Ajax->activate('dimension_id'); + $Ajax->activate('dimension2_id'); } } echo gl_all_accounts_list('code_id', null, true, true); diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index d2196a2c..b03893de 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -26,7 +26,7 @@ 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['no_header']), false, "", $js, false, "", true); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); diff --git a/includes/dashboard.inc b/includes/dashboard.inc index bb6e6e25..fa15e1c1 100644 --- a/includes/dashboard.inc +++ b/includes/dashboard.inc @@ -610,7 +610,7 @@ function bank_balance($today, $width) while ($myrow = db_fetch($result)) { alt_table_row_color($k); - label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"])); + label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"].'&no_header=1')); label_cell($myrow["bank_curr_code"]); amount_cell($myrow['balance']); end_row(); diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index 6ff977ad..dbcdee67 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -1005,7 +1005,7 @@ function bank_balance_row($bank_acc, $parms='') $bal = get_balance_before_for_bank_account($bank_acc, $to); label_row( _("Bank Balance:"), " " . price_format($bal) ."", $parms); -- 2.30.2