From dc01ce23bff258ca5b96bad1fc89084d24b08b70 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 3 Nov 2013 14:39:23 +0100 Subject: [PATCH] Supplier Invoice: Fixed tax input refresh after change in gl/grn items. --- purchasing/supplier_invoice.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 5c5c91ac..07b8d665 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -82,6 +82,15 @@ function clear_fields() $Ajax->activate('gl_items'); set_focus('gl_code'); } + +function reset_tax_input() +{ + global $Ajax; + + unset($_POST['mantax']); + $Ajax->activate('inv_tot'); +} + //------------------------------------------------------------------------------------------------ // GL postings are often entered in the same form to two accounts // so fileds are cleared only on user demand. @@ -126,6 +135,7 @@ if (isset($_POST['AddGLCodeToTrans'])){ $_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name, $_POST['dimension_id'], $_POST['dimension2_id'], input_num('amount'), $_POST['memo_']); + reset_tax_input(); set_focus('gl_code'); } } @@ -273,7 +283,7 @@ function commit_item_data($n) $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n), $_POST['order_price'.$n], input_num('ChgPrice'.$n), $_POST['std_cost_unit'.$n], ""); - unset($_POST['mantax']); + reset_tax_input(); } } @@ -303,9 +313,8 @@ $id3 = find_submit('Delete'); if ($id3 != -1) { $_SESSION['supp_trans']->remove_grn_from_trans($id3); - unset($_POST['mantax']); $Ajax->activate('grn_items'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } $id4 = find_submit('Delete2'); @@ -313,8 +322,8 @@ if ($id4 != -1) { $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4); clear_fields(); + reset_tax_input(); $Ajax->activate('gl_items'); - $Ajax->activate('inv_tot'); } $id2 = -1; @@ -326,7 +335,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) remove_not_invoice_item($id2); display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2)); - } + } } if (isset($_POST['go'])) @@ -334,7 +343,7 @@ if (isset($_POST['go'])) $Ajax->activate('gl_items'); display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV); $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } start_form(); -- 2.30.2