X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=be602d93de0568b04d417b2f7f4f98b7afa55fb4;hb=07737913eea4abbc7a8604a286852facb2134540;hp=06e82837a1ade8614b23d621281f7a4666abba9d;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 06e82837..be602d93 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -15,16 +15,15 @@ $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 ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 page(_($help_context = "Work Order Entry"), false, false, "", $js);
 
@@ -63,7 +62,7 @@ if (isset($_GET['AddedID']))
 		submenu_print(_("&Email This Work Order"), ST_WORKORDER, $id, null, 1);
     	display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")), 1);
     	$ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype, 'PARAM_3' => '',
-    		'PARAM_4' => (isset($def_print_orientation) && $def_print_orientation == 1 ? 1 : 0)); 
+    		'PARAM_4' => (user_def_print_orientation() == 1 ? 1 : 0)); 
     	display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1);
 		hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$stype&trans_no=$id");
 	}
@@ -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');
@@ -275,7 +259,8 @@ 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['stock_id'],  $_POST['date_'], $_POST['RequDate'], $_POST['memo_'],
+		$_POST['old_stk_id'], $_POST['old_qty']);
 	new_doc_date($_POST['date_']);
 	meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
 }
@@ -301,7 +286,7 @@ if (isset($_POST['delete']))
 	{ //ie not cancelled the delete as a result of above tests
 
 		// delete the actual work order
-		delete_work_order($selected_id);
+		delete_work_order($selected_id, $_POST['stock_id'], $_POST['quantity'], $_POST['date_']);
 		meta_forward($_SERVER['PHP_SELF'], "DeletedID=$selected_id");
 	}
 }
@@ -380,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);
 }
@@ -423,24 +408,23 @@ else
     date_row(_("Date") . ":", 'date_', '', true);
 	hidden('RequDate', '');
 
-	$sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts";
-	$rs = db_query($sql,"could not get bank accounts");
-	$r = db_fetch_row($rs);
+	$bank_act = get_default_bank_account();
 	if (!isset($_POST['Labour']))
 	{
 		$_POST['Labour'] = price_format(0);
-		$_POST['cr_lab_acc'] = $r[0];
+		$_POST['cr_lab_acc'] = $bank_act['account_code'];
 	}
+
 	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'] = $r[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);
-	
+
 }
 
 if (get_post('released'))
@@ -471,4 +455,3 @@ else
 end_form();
 end_page();
 
-?>
\ No newline at end of file