X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fsupplier_credit.php;h=2b8c07b392e62e1d7d21b14c6c398aa197a7b61b;hb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;hp=0f75493a3717088b8e2faf09b8bc917dab910ac3;hpb=e735f0a06f8a43ed4885ff51a5c0b4332c130b40;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 0f75493a..2b8c07b3 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 //----------------------------------------------------------------------------------------
@@ -31,7 +31,7 @@ if ($use_date_picker)
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
 if (isset($_GET['ModifyCredit']))
-	check_is_closed(ST_SUPPINVOICE, $_GET['ModifyCredit']);
+	check_is_editable(ST_SUPPINVOICE, $_GET['ModifyCredit']);
 
 //---------------------------------------------------------------------------------------------------
 
@@ -57,13 +57,12 @@ if (isset($_GET['New']))
 		$help_context = "Supplier Credit Note";
 		$_SESSION['page_title'] = _("Supplier Credit Note");
 
+	} else {
+		$help_context = "Supplier Credit Note";
+		$_SESSION['page_title'] = _("Supplier Credit Note");
 		$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
-	} elseif (isset($_GET['ModifyInvoice'])) {
-		$help_context = 'Modifying Purchase Invoice';
-		$_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']);
-		$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']);
 	}
-
+}
 page($_SESSION['page_title'], false, false, "", $js);
 
 //---------------------------------------------------------------------------------------------------------------
@@ -82,11 +81,10 @@ if (isset($_GET['AddedID']))
 
     hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "New=1");
 	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
-	
+
 	display_footer_exit();
 }
 
-
 function clear_fields()
 {
 	global $Ajax;
@@ -100,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.
@@ -144,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');
 	}
 }
@@ -153,8 +161,8 @@ 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())
 	{
 		display_error(_("The credit note cannot be processed because the there are no items or values on the invoice.  Credit notes are expected to have a charge."));
@@ -208,6 +216,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;
 }
 
@@ -220,7 +243,10 @@ function handle_commit_credit_note()
 	if (!check_data())
 		return;
 
-	$invoice_no = add_supp_invoice($_SESSION['supp_trans']);
+	if (isset($_POST['invoice_no']))
+		$invoice_no = add_supp_invoice($_SESSION['supp_trans'], $_POST['invoice_no']);
+	else
+		$invoice_no = add_supp_invoice($_SESSION['supp_trans']);
 
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
@@ -237,6 +263,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."));
@@ -295,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');
@@ -303,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']))
@@ -317,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();
 }