X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=6d508c64963ac0dd35b9df843f89aa4c4a793893;hb=13fae1ba1d78cff66e326a006be2f538dd404248;hp=2804ea1e1fc04627a99bfe1ec75cedf903826bdd;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index 2804ea1e..6d508c64 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -12,21 +12,20 @@
 $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");
 
 $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(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
+page(_($help_context = "Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
 
 if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 {
@@ -39,7 +38,7 @@ if (isset($_GET['AddedID']))
 {
 	include_once($path_to_root . "/reporting/includes/reporting.inc");
 	$id = $_GET['AddedID'];
-	$stype = systypes::work_order();
+	$stype = ST_WORKORDER;
 
 	display_notification(_("The manufacturing process has been entered."));
 	
@@ -50,6 +49,7 @@ if (isset($_GET['AddedID']))
    	display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1);
 
 	hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process"));
+	br();
 
 	end_page();
 	exit;
@@ -57,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;
@@ -67,20 +67,12 @@ if (strlen($wo_details[0]) == 0)
 
 //--------------------------------------------------------------------------------------------------
 
-function can_process()
+function can_process($wo_details)
 {
-	global $wo_details;
+	global $SysPrefs;
 
-	if (!references::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;
 	}
@@ -100,24 +92,27 @@ function can_process()
 	}
 	elseif (!is_date_in_fiscalyear($_POST['date_']))
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('date_');
 		return false;
 	}
-	if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0)
+	if (date_diff2(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;
 	}
-
+	// don't produce more that required. Otherwise change the Work Order.
+	if (input_num('quantity') > ($wo_details["units_reqd"] - $wo_details["units_issued"]))
+	{
+		display_error(_("The production exceeds the quantity needed. Please change the Work Order."));
+		set_focus('quantity');
+		return false;
+	}
 	// if unassembling we need to check the qoh
-	if (($_POST['ProductionType'] == 0) && !sys_prefs::allow_negative_stock())
+	if (($_POST['ProductionType'] == 0) && !$SysPrefs->allow_negative_stock())
 	{
-		$wo_details = get_work_order($_POST['selected_id']);
-
-		$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $_POST['date_']);
-		if (-$_POST['quantity'] + $qoh < 0)
+		if (check_negative_stock($wo_details["stock_id"], -input_num('quantity'), $wo_details["loc_code"], $_POST['date_']))
 		{
 			display_error(_("The unassembling cannot be processed because there is insufficient stock."));
 			set_focus('quantity');
@@ -126,7 +121,7 @@ function can_process()
 	}
 
 	// if production we need to check the qoh of the wo requirements
-	if (($_POST['ProductionType'] == 1) && !sys_prefs::allow_negative_stock())
+	if (($_POST['ProductionType'] == 1) && !$SysPrefs->allow_negative_stock())
 	{
     	$err = false;
     	$result = get_wo_requirements($_POST['selected_id']);
@@ -134,13 +129,13 @@ function can_process()
 		{
 			if ($row['mb_flag'] == 'D') // service, non stock
 				continue;
-			$qoh = get_qoh_on_date($row["stock_id"], $row["loc_code"], $_POST['date_']);
-			if ($qoh - $row['units_req'] * $_POST['quantity'] < 0)
+
+			if (check_negative_stock($row["stock_id"], -$row['units_req'] * input_num('quantity'), $row["loc_code"], $_POST['date_']))
 			{
     			display_error( _("The production cannot be processed because a required item would cause a negative inventory balance :") .
     				" " . $row['stock_id'] . " - " .  $row['description']);
-    			$err = true;	
-			}	
+    			$err = true;
+			}
 		}
 		if ($err)
 		{
@@ -153,7 +148,7 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process() == true)
+if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process($wo_details) == true)
 {
 
 	$close_wo = 0;
@@ -164,7 +159,7 @@ if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_proces
 	if ($_POST['ProductionType'] == 0)
 		$_POST['quantity'] = -$_POST['quantity'];
 
-	 $id = work_order_produce($_POST['selected_id'], $_POST['ref'], $_POST['quantity'],
+	 $id = work_order_produce($_POST['selected_id'], $_POST['ref'], input_num('quantity'),
 			$_POST['date_'], $_POST['memo_'], $close_wo);
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']."&date=".$_POST['date_']);
@@ -179,17 +174,16 @@ 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'] == '')
-{
-	$_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
-}
+	$_POST['quantity'] = qty_format(max($wo_details["units_reqd"] - $wo_details["units_issued"], 0), $wo_details["stock_id"], $dec);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 br();
 
-ref_row(_("Reference:"), 'ref', '', references::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;
@@ -197,9 +191,7 @@ if (!isset($_POST['ProductionType']))
 yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
 	_("Produce Finished Items"), _("Return Items to Work Order"));
 
-small_qty_row(_("Quantity:"), 'quantity', null, null, null, get_qty_dec($wo_details["stock_id"]));
-
-date_row(_("Date:"), 'date_');
+small_qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
 
 textarea_row(_("Memo:"), 'memo_', null, 40, 3);
 
@@ -212,4 +204,3 @@ end_form();
 
 end_page();
 
-?>
\ No newline at end of file