X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=f4982933fa2d347d9c226e0d1fc4a405e930890a;hb=4e6811018489ed5d9e4c029342c958e266d7b298;hp=4824344e0d907b1aff4ce8fdf92c01b1a09e0e8f;hpb=3450b59782a9ac2327a9c771975960883c5b1597;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 4824344e..f4982933 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.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');
 	}
 }
@@ -194,16 +204,15 @@ 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:") .
 						" " . $stock['stock_id'] . " - " . $stock['description'] . " - " .
-						_("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($stock['stock_id'])));
+						_("Quantity On Hand") . " = " . number_format2(get_qoh_on_date($stock['stock_id'], null, 
+						$_SESSION['supp_trans']->tran_date), get_qty_dec($stock['stock_id'])));
 					return false;
 				}
-				return true;
 			}
 		}
 	}
@@ -267,6 +276,7 @@ function commit_item_data($n)
     		$_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
     		$_POST['order_price'.$n], input_num('ChgPrice'.$n),
     		$_POST['std_cost_unit'.$n], "");
+		reset_tax_input();
 	}
 }
 
@@ -298,7 +308,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');
@@ -306,13 +316,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']))
@@ -320,7 +330,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();
 }