X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_credit.php;h=b4f31966d9aa7f8f7e82368b5625a6960c0a5991;hb=a093e88c7571e931f9109a09f95bb7f983f78023;hp=1a8d63e9bdca091b7b481876a72b7e6d01d80baa;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 1a8d63e9..b4f31966 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -62,8 +62,7 @@ if (isset($_GET['New']))
 		unset ($_SESSION['supp_trans']);
 	}
 
-	$_SESSION['supp_trans'] = new supp_trans;
-	$_SESSION['supp_trans']->is_invoice = false;
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
 	if (isset($_GET['invoice_no']))
 	{
 		$_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
@@ -83,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.
@@ -97,8 +105,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 	$Ajax->activate('gl_items');
 	$input_error = false;
 
-	$sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($_POST['gl_code']);
-	$result = db_query($sql,"get account information");
+	$result = get_gl_account_info($_POST['gl_code']);
 	if (db_num_rows($result) == 0)
 	{
 		display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
@@ -128,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');
 	}
 }
@@ -137,7 +145,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value, $Refs;
+	global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
 	
 	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
@@ -192,6 +200,21 @@ function check_data()
 		return false;
 	}
 
+	if (!$SysPrefs->allow_negative_stock()) {
+		foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
+			if (is_inventory_item($item->item_code))
+			{
+				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'])));
+					return false;
+				}
+			}
+		}
+	}
 	return true;
 }
 
@@ -224,6 +247,7 @@ if (isset($_POST['PostCreditNote']))
 
 function check_item_data($n)
 {
+
 	if (!check_num('This_QuantityCredited'.$n, 0))
 	{
 		display_error(_("The quantity to credit must be numeric and greater than zero."));
@@ -245,13 +269,11 @@ function commit_item_data($n)
 {
 	if (check_item_data($n))
 	{
-		$complete = False;
-
 		$_SESSION['supp_trans']->add_grn_to_trans($n,
     		$_POST['po_detail_item'.$n], $_POST['item_code'.$n],
     		$_POST['item_description'.$n], $_POST['qty_recd'.$n],
     		$_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
-    		$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+    		$_POST['order_price'.$n], input_num('ChgPrice'.$n),
     		$_POST['std_cost_unit'.$n], "");
 	}
 }
@@ -284,7 +306,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');
@@ -292,13 +314,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']))
@@ -306,7 +328,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();
 }
 
 
@@ -318,8 +340,6 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
 	display_error('No supplier found for entered search text');
 else {
-	start_outer_table("$table_style2 width=98%", 5);
-
 	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
 
 	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
@@ -327,8 +347,6 @@ else {
 	div_start('inv_tot');
 	invoice_totals($_SESSION['supp_trans']);
 	div_end();
-
-	end_outer_table(0, false);
 }
 
 if ($id != -1)