X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=2d220c4fd25fbca9bfa4a2b19eb580ba54cd1bec;hb=268a54dcfd08aff7113bc3afe8b784f36db2d0d4;hp=3d3f86e64e33643671549e348713a60ad0a0e7fd;hpb=19dce8c7be29e4cc8e7be92d044259348373d456;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index 3d3f86e6..2d220c4f 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'); } //----------------------------------------------------------------------------------------------- @@ -185,7 +189,6 @@ function create_cart($type, $trans_no) // so we have to restore it from original gl amounts $ex_rate = $bank_trans['amount']/$row['amount']; } else { - $date = $row['tran_date']; $cart->add_gl_item( $row['account'], $row['dimension_id'], $row['dimension2_id'], $row['amount'], $row['memo_']); } @@ -213,7 +216,7 @@ function create_cart($type, $trans_no) function check_trans() { - global $Refs; + global $Refs, $systypes_array; $input_error = 0; @@ -241,10 +244,12 @@ function check_trans() } if ($trans = check_bank_account_history($amnt_chg, $_POST['bank_account'], $_POST['date_'])) { - display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."), - $systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date']))); - set_focus('amount'); - $input_error = 1; + if (isset($trans['trans_no'])) { + display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."), + $systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date']))); + set_focus('amount'); + $input_error = 1; + } } if (!check_reference($_POST['ref'], $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id)) { @@ -381,7 +386,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']))