X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=0bd89bd7d5648dfa5a8b5f2b7da24be8a85f3035;hb=b32d16b2c0c6c43e569ebe87e2a13ceb892b5788;hp=ecc1d0a64db3198bd082aa1b5c6a57fa35e396c6;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index ecc1d0a6..0bd89bd7 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -12,6 +12,8 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 
 $js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 page(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
@@ -23,7 +25,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_GET['AddedID'])) 
+if (isset($_GET['AddedID']))
 {
 
 	display_note(_("The manufacturing process has been entered."));
@@ -38,7 +40,7 @@ if (isset($_GET['AddedID']))
 
 $wo_details = get_work_order($_POST['selected_id']);
 
-if (strlen($wo_details[0]) == 0) 
+if (strlen($wo_details[0]) == 0)
 {
 	display_error(_("The order number sent is not valid."));
 	exit;
@@ -50,43 +52,43 @@ function can_process()
 {
 	global $wo_details;
 
-	if (!references::is_valid($_POST['ref'])) 
+	if (!references::is_valid($_POST['ref']))
 	{
 		display_error(_("You must enter a reference."));
+		set_focus('ref');
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], 29)) 
+	if (!is_new_reference($_POST['ref'], 29))
 	{
 		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
 		return false;
 	}
 
-	if (!is_numeric($_POST['quantity']))
+	if (!check_num('quantity', 0))
 	{
-		display_error(_("The quantity entered is not a valid number."));
-		return false;
-	}
-
-	if ($_POST['quantity'] <= 0)
-	{
-		display_error(_("The quantity entered must be greater than zero."));
+		display_error(_("The quantity entered is not a valid number or less then zero."));
+		set_focus('quantity');
 		return false;
 	}
 
 	if (!is_date($_POST['date_']))
 	{
 		display_error(_("The entered date is invalid."));
+		set_focus('date_');
 		return false;
-	} 
-	elseif (!is_date_in_fiscalyear($_POST['date_'])) 
+	}
+	elseif (!is_date_in_fiscalyear($_POST['date_']))
 	{
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('date_');
 		return false;
 	}
-	if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) 
+	if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
 	{
 		display_error(_("The production date cannot be before the release date of the work order."));
+		set_focus('date_');
 		return false;
 	}
 
@@ -96,9 +98,10 @@ function can_process()
 		$wo_details = get_work_order($_POST['selected_id']);
 
 		$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $date_);
-		if (-$_POST['quantity'] + $qoh < 0) 
+		if (-$_POST['quantity'] + $qoh < 0)
 		{
 			display_error(_("The unassembling cannot be processed because there is insufficient stock."));
+			set_focus('quantity');
 			return false;
 		}
 	}
@@ -108,7 +111,7 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true)) 
+if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true))
 {
 
 	$close_wo = 0;
@@ -136,14 +139,14 @@ start_form();
 hidden('selected_id', $_POST['selected_id']);
 //hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
-if (!isset($_POST['quantity']) || $_POST['quantity'] == '') 
+if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
 {
 	$_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
 }
 
 start_table();
 
-ref_row(_("Reference:"), 'ref', references::get_next(29));
+ref_row(_("Reference:"), 'ref', '', references::get_next(29));
 
 if (!isset($_POST['ProductionType']))
 	$_POST['ProductionType'] = 1;