From 40a86b30aa459c05925c41d55bbeff2c293a7ce5 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 31 Aug 2018 15:27:27 +0200 Subject: [PATCH] Rerun bug 4601: memo line not cleared after enter new payment item. @Braath Waate. --- gl/includes/ui/gl_journal_ui.inc | 1 + gl/inquiry/bank_inquiry.php | 2 +- includes/dashboard.inc | 2 +- includes/ui/ui_input.inc | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc index 44762f7e..69ed170c 100644 --- a/gl/includes/ui/gl_journal_ui.inc +++ b/gl/includes/ui/gl_journal_ui.inc @@ -256,6 +256,7 @@ function gl_edit_item_controls(&$order, $dim, $sub_accounts, $Index=null) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2); + $_POST['LineMemo'] = ""; } if (get_post('_code_id_update')) diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index b03893de..e273099d 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 Account Inquiry"), isset($_GET['no_header']), false, "", $js, false, "", true); +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.")); diff --git a/includes/dashboard.inc b/includes/dashboard.inc index fa15e1c1..bb6e6e25 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"].'&no_header=1')); + label_cell(viewer_link($myrow["bank_account_name"], 'gl/inquiry/bank_inquiry.php?bank_account='.$myrow["bank_act"])); 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 dbcdee67..6ff977ad 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