X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=c61f19bbad2c952e5b95615e628301ec13b93faa;hb=498f13d19b716779a3b986ff399121fb2ac9a53a;hp=b8036c371446757c245dec45340822f4a4e036e8;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index b8036c37..c61f19bb 100644
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -9,11 +9,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 10;
-$path_to_root="..";
+$page_security = 'SA_MANUFRECEIVE';
+$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");
 
@@ -36,8 +37,17 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 
 if (isset($_GET['AddedID']))
 {
+	include_once($path_to_root . "/reporting/includes/reporting.inc");
+	$id = $_GET['AddedID'];
+	$stype = ST_WORKORDER;
 
-	display_note(_("The manufacturing process has been entered."));
+	display_notification(_("The manufacturing process has been entered."));
+	
+    display_note(get_trans_view_str($stype, $id, _("View this Work Order")));
+
+   	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); 
+   	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"));
 
@@ -59,9 +69,9 @@ if (strlen($wo_details[0]) == 0)
 
 function can_process()
 {
-	global $wo_details;
+	global $wo_details, $SysPrefs, $Refs;
 
-	if (!references::is_valid($_POST['ref']))
+	if (!$Refs->is_valid($_POST['ref']))
 	{
 		display_error(_("You must enter a reference."));
 		set_focus('ref');
@@ -94,7 +104,7 @@ function can_process()
 		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_');
@@ -102,11 +112,11 @@ function can_process()
 	}
 
 	// 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"], $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 +125,35 @@ function can_process()
 		}
 	}
 
+	// if production we need to check the qoh of the wo requirements
+	if (($_POST['ProductionType'] == 1) && !$SysPrefs->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;
@@ -134,7 +167,7 @@ if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process
 	 $id = work_order_produce($_POST['selected_id'], $_POST['ref'], $_POST['quantity'],
 			$_POST['date_'], $_POST['memo_'], $close_wo);
 
-	meta_forward($_SERVER['PHP_SELF'], "AddedID=$id");
+	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']."&date=".$_POST['date_']);
 }
 
 //-------------------------------------------------------------------------------------
@@ -153,9 +186,10 @@ if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
 	$_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
 }
 
-start_table();
+start_table($table_style2);
+br();
 
-ref_row(_("Reference:"), 'ref', '', references::get_next(29));
+ref_row(_("Reference:"), 'ref', '', $Refs->get_next(29));
 
 if (!isset($_POST['ProductionType']))
 	$_POST['ProductionType'] = 1;
@@ -171,7 +205,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();