X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=be602d93de0568b04d417b2f7f4f98b7afa55fb4;hb=acec14f639533b3e6b9b33c395ae5aeff29684f3;hp=4466355d610df8577d2d3133383791537364683e;hpb=13367be8aaf5175295f7aab7160370458dad1824;p=fa-stable.git

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 4466355d..be602d93 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -15,14 +15,13 @@ $path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
 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)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -123,20 +122,12 @@ if (!isset($_POST['date_']))
 
 function can_process()
 {
-	global $selected_id, $SysPrefs, $Refs;
+	global $selected_id, $SysPrefs;
 
 	if (!isset($selected_id))
 	{
-    	if (!$Refs->is_valid($_POST['wo_ref']))
+    	if (!check_reference($_POST['wo_ref'], ST_WORKORDER))
     	{
-    		display_error(_("You must enter a reference."));
-			set_focus('wo_ref');
-    		return false;
-    	}
-
-    	if (!is_new_reference($_POST['wo_ref'], ST_WORKORDER))
-    	{
-    		display_error(_("The entered reference is already in use."));
 			set_focus('wo_ref');
     		return false;
     	}
@@ -232,15 +223,8 @@ function can_process()
     		display_error( _("The date entered is in an invalid format."));
     		return false;
 		}
-		//elseif (!is_date_in_fiscalyear($_POST['RequDate']))
-		//{
-		//  display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
-		//	return false;
-		//}
     	if (isset($selected_id))
     	{
-    		$myrow = get_work_order($selected_id, true);
-
     		if ($_POST['units_issued'] > input_num('quantity'))
     		{
 				set_focus('quantity');
@@ -381,7 +365,7 @@ if (isset($selected_id))
 else
 {
 	$_POST['units_issued'] = $_POST['released'] = 0;
-	ref_row(_("Reference:"), 'wo_ref', '', $Refs->get_next(ST_WORKORDER));
+	ref_row(_("Reference:"), 'wo_ref', '', $Refs->get_next(ST_WORKORDER, null, get_post('date_')), false, ST_WORKORDER);
 
 	wo_types_list_row(_("Type:"), 'type', null);
 }
@@ -471,4 +455,3 @@ else
 end_form();
 end_page();
 
-?>
\ No newline at end of file