Merged changes form stabel branch up to the current state (2.3.22+).

[fa-stable.git] / purchasing / supplier_credit.php

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 3ee243055bf96715d0bfd822be0ef98152458cab..0d1e6c9fd75455983b2a322037187d08a3cfdc12 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -98,6 +98,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.
@@ -142,6 +151,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');
        }
 }
@@ -210,8 +220,7 @@ function check_data()
                foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
                        if (is_inventory_item($item->item_code))
                        {
-                               $qoh = get_qoh_on_date($item->item_code, null, $_SESSION['supp_trans']->tran_date);
-                               if ($item->this_quantity_inv > $qoh)
+                               if (check_negative_stock($item->item_code, -$item->this_quantity_inv, null, $_SESSION['supp_trans']->tran_date))
                                {
                                        $stock = get_item($item->item_code);
                                        display_error(_("The return cannot be processed because there is an insufficient quantity for item:") .
@@ -313,7 +322,7 @@ if ($id3 != -1)
 {
        $_SESSION['supp_trans']->remove_grn_from_trans($id3);
        $Ajax->activate('grn_items');
-       $Ajax->activate('inv_tot');
+       reset_tax_input();
 }
 
 $id4 = find_submit('Delete2');
@@ -321,13 +330,13 @@ 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');
 }
 if (isset($_POST['RefreshInquiry']))
 {
        $Ajax->activate('grn_items');
-       $Ajax->activate('inv_tot');
+       reset_tax_input();
 }
 
 if (isset($_POST['go']))
@@ -335,7 +344,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();
 }