X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=5afdd61f5af6920f86e62fc024179328e12ff013;hb=68118480967870cf8ed31ca28902a663c5f2499f;hp=b8036c371446757c245dec45340822f4a4e036e8;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index b8036c37..5afdd61f 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -14,6 +14,7 @@ $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 . "/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");
 
@@ -37,7 +38,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 if (isset($_GET['AddedID']))
 {
 
-	display_note(_("The manufacturing process has been entered."));
+	display_notification(_("The manufacturing process has been entered."));
 
 	hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process"));
 
@@ -106,7 +107,7 @@ function can_process()
 	{
 		$wo_details = get_work_order($_POST['selected_id']);
 
-		$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $date_);
+		$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $_POST['date_']);
 		if (-$_POST['quantity'] + $qoh < 0)
 		{
 			display_error(_("The unassembling cannot be processed because there is insufficient stock."));
@@ -115,12 +116,35 @@ function can_process()
 		}
 	}
 
+	// if production we need to check the qoh of the wo requirements
+	if (($_POST['ProductionType'] == 1) && !sys_prefs::allow_negative_stock())
+	{
+    	$err = false;
+    	$result = get_wo_requirements($_POST['selected_id']);
+		while ($row = db_fetch($result))
+		{
+			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)
+			{
+    			display_error( _("The production cannot be processed because a required item would cause a negative inventory balance :") .
+    				" " . $row['stock_id'] . " - " .  $row['description']);
+    			$err = true;	
+			}	
+		}
+		if ($err)
+		{
+			set_focus('quantity');
+			return false;
+		}	
+	}
 	return true;
 }
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true))
+if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process() == true)
 {
 
 	$close_wo = 0;
@@ -171,7 +195,7 @@ textarea_row(_("Memo:"), 'memo_', null, 40, 3);
 
 end_table(1);
 
-submit_center_first('Process', _("Process"), '', true);
+submit_center_first('Process', _("Process"), '', 'default');
 submit_center_last('ProcessAndClose', _("Process And Close Order"), '', true);
 
 end_form();