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

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 4466355d..4aea96fb 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,26 +122,18 @@ 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;
     	}
 	}
 
-	if (!check_num('quantity', 0))
+	if (!check_num('quantity', 1))
 	{
 		display_error( _("The quantity entered is invalid or less than zero."));
 		set_focus('quantity');
@@ -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');
@@ -275,8 +259,7 @@ if (isset($_POST['UPDATE_ITEM']) && can_process())
 {
 
 	update_work_order($selected_id, $_POST['StockLocation'], input_num('quantity'),
-		$_POST['stock_id'],  $_POST['date_'], $_POST['RequDate'], $_POST['memo_'],
-		$_POST['old_stk_id'], $_POST['old_qty']);
+		$_POST['stock_id'],  $_POST['date_'], $_POST['RequDate'], $_POST['memo_']);
 	new_doc_date($_POST['date_']);
 	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
 }
@@ -333,9 +316,9 @@ $existing_comments = "";
 $dec = 0;
 if (isset($selected_id))
 {
-	$myrow = get_work_order($selected_id);
+	$myrow = get_work_order($selected_id, true);
 
-	if (strlen($myrow[0]) == 0)
+	if ($myrow === false)
 	{
 		echo _("The order number sent is not valid.");
 		safe_exit();
@@ -360,7 +343,6 @@ if (isset($selected_id))
 	$_POST['date_'] = sql2date($myrow["date_"]);
 	$_POST['RequDate'] = sql2date($myrow["required_by"]);
 	$_POST['released_date'] = sql2date($myrow["released_date"]);
-	$_POST['memo_'] = "";
 	$_POST['units_issued'] = $myrow["units_issued"];
 	$_POST['Costs'] = price_format($myrow["additional_costs"]);
 
@@ -371,8 +353,6 @@ if (isset($selected_id))
 	hidden('released', $_POST['released']);
 	hidden('released_date', $_POST['released_date']);
 	hidden('selected_id',  $selected_id);
-	hidden('old_qty', $myrow["units_reqd"]);
-	hidden('old_stk_id', $myrow["stock_id"]);
 
 	label_row(_("Reference:"), $_POST['wo_ref']);
 	label_row(_("Type:"), $wo_types_array[$_POST['type']]);
@@ -381,7 +361,8 @@ 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);
 }
@@ -424,20 +405,19 @@ else
     date_row(_("Date") . ":", 'date_', '', true);
 	hidden('RequDate', '');
 
-	$bank_act = get_default_bank_account();
-	if (!isset($_POST['Labour']))
+	if (!isset($_POST['Labour']) || list_updated('stock_id') || list_updated('type'))
 	{
-		$_POST['Labour'] = price_format(0);
+		$bank_act = get_default_bank_account();
+		$item = get_item(get_post('stock_id'));
+		$_POST['Labour'] = price_format(get_post('type') == WO_ASSEMBLY ? $item['labour_cost'] : 0);
 		$_POST['cr_lab_acc'] = $bank_act['account_code'];
+		$_POST['Costs'] = price_format(get_post('type') == WO_ASSEMBLY ? $item['overhead_cost'] : 0);
+		$_POST['cr_acc'] = $bank_act['account_code'];
+		$Ajax->activate('_page_body');
 	}
 
 	amount_row($wo_cost_types[WO_LABOUR], 'Labour');
 	gl_all_accounts_list_row(_("Credit Labour Account"), 'cr_lab_acc', null);
-	if (!isset($_POST['Costs']))
-	{
-		$_POST['Costs'] = price_format(0);
-		$_POST['cr_acc'] = $bank_act['account_code'];
-	}
 	amount_row($wo_cost_types[WO_OVERHEAD], 'Costs');
 	gl_all_accounts_list_row(_("Credit Overhead Account"), 'cr_acc', null);
 
@@ -471,4 +451,3 @@ else
 end_form();
 end_page();
 
-?>
\ No newline at end of file