Bug 4601: memo line not cleared after enter new payment item

Inbox. @Braathwaate.

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 71e2c0450f74f8ed5383589b8ad0c55b0f8235e3..2d44653179c3e0e72c54c914a610f727a0663081 100644 (file)
--- 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 86a17bcd49564f2659b0cea7118f03cd18e43433..34a4fed92971e618787409dde7e7ef11d0fe3c1a 100644 (file)
--- 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 d2196a2cf94db4549f42afcbd604e84c0eadbf8f..b03893decfd6d542047fd96bad74f8358c85da65 100644 (file)
--- 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 bb6e6e258335fd231bd3bc75f987f302b663426e..fa15e1c12cd1e437fee845bc7436ce0a6b83be10 100644 (file)
--- 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 6ff977ad096d1eec3c64490e926f6c27e1877c30..dbcdee67de47e2568a181bec8cc6d56d9f7e451d 100644 (file)
--- 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:"),
                "<a target='_blank' " . ($bal<0 ? 'class="redfg"' : '')
-               ."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."'"
+               ."href='$path_to_root/gl/inquiry/bank_inquiry.php?bank_account=".$bank_acc."&no_header=1"."'"           
                ." onclick=\"javascript:openWindow(this.href,this.target); return false;\" >&nbsp;"
                . price_format($bal)
                ."</a>", $parms);