X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=6d508c64963ac0dd35b9df843f89aa4c4a793893;hb=6bcd87642330092910f5d6977845a76ac59350ac;hp=1d42cbf643ceb86be1945854c0ae1e34f0852188;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index 1d42cbf6..6d508c64 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -12,11 +12,10 @@
 $page_security = 'SA_MANUFRECEIVE';
 $path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/inventory.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc");
-include_once($path_to_root . "/includes/db/inventory_db.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 
 include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
@@ -58,9 +57,9 @@ if (isset($_GET['AddedID']))
 
 //--------------------------------------------------------------------------------------------------
 
-$wo_details = get_work_order($_POST['selected_id']);
+$wo_details = get_work_order($_POST['selected_id'], true);
 
-if (strlen($wo_details[0]) == 0)
+if ($wo_details === false)
 {
 	display_error(_("The order number sent is not valid."));
 	exit;
@@ -70,18 +69,10 @@ if (strlen($wo_details[0]) == 0)
 
 function can_process($wo_details)
 {
-	global $SysPrefs, $Refs;
+	global $SysPrefs;
 
-	if (!$Refs->is_valid($_POST['ref']))
+	if (!check_reference($_POST['ref'], ST_MANURECEIVE))
 	{
-		display_error(_("You must enter a reference."));
-		set_focus('ref');
-		return false;
-	}
-
-	if (!is_new_reference($_POST['ref'], 29))
-	{
-		display_error(_("The entered reference is already in use."));
 		set_focus('ref');
 		return false;
 	}
@@ -183,7 +174,6 @@ display_wo_details($_POST['selected_id']);
 start_form();
 
 hidden('selected_id', $_POST['selected_id']);
-//hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
 $dec = get_qty_dec($wo_details["stock_id"]);
 if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
@@ -192,7 +182,8 @@ if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
 start_table(TABLESTYLE2);
 br();
 
-ref_row(_("Reference:"), 'ref', '', $Refs->get_next(29));
+date_row(_("Date:"), 'date_');
+ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_MANURECEIVE, null, get_post('date_')), false, ST_MANURECEIVE);
 
 if (!isset($_POST['ProductionType']))
 	$_POST['ProductionType'] = 1;
@@ -202,8 +193,6 @@ yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
 
 small_qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
 
-date_row(_("Date:"), 'date_');
-
 textarea_row(_("Memo:"), 'memo_', null, 40, 3);
 
 end_table(1);