X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=c2fe7c6113f9d7cfcdb62c792b55392903396107;hb=b6ae2ddcd0cbc571edd01157ca1c8d44bbe071ef;hp=3ee243055bf96715d0bfd822be0ef98152458cab;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 3ee24305..c2fe7c61 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 //----------------------------------------------------------------------------------------
@@ -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');
 	}
 }
@@ -151,7 +161,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
+	global $Refs, $SysPrefs;
 
 	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
@@ -200,18 +210,11 @@ function check_data()
 		return false;
 	}
 
-	if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value))
-	{
-		display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."));
-		return false;
-	}
-
 	if (!$SysPrefs->allow_negative_stock()) {
 		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 +316,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 +324,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 +338,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();
 }
 
 
@@ -347,9 +350,9 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
 	display_error('No supplier found for entered search text');
 else {
-	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
+	display_grn_items($_SESSION['supp_trans'], 1);
 
-	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+	display_gl_items($_SESSION['supp_trans'], 1);
 
 	div_start('inv_tot');
 	invoice_totals($_SESSION['supp_trans']);
@@ -371,4 +374,3 @@ br();
 
 end_form();
 end_page();
-?>