X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=f94970ba4f24bc55e25211e8cdb06db9eb9d3e51;hb=3dc709543cc713810811d269a8b2ce035146a559;hp=6248ed866759c86f29505eed988033b523c0c311;hpb=83e9c286c92b366b482a0bffc6de8fe0fa5b390e;p=fa-stable.git

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index 6248ed86..f94970ba 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");
 
@@ -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 = systypes::work_order();
 
-	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"));
 
@@ -106,7 +116,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."));
@@ -124,7 +134,7 @@ function can_process()
 		{
 			if ($row['mb_flag'] == 'D') // service, non stock
 				continue;
-			$qoh = get_qoh_on_date($row["stock_id"], $row["loc_code"], $date_);
+			$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 :") .
@@ -143,10 +153,13 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_POST['ProcessAndClose']) && can_process() == true)
+if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_process() == true)
 {
 
-	$close_wo = 1;
+	$close_wo = 0;
+	if (isset($_POST['ProcessAndClose']) && ($_POST['ProcessAndClose']!=""))
+		$close_wo = 1;
+
 	// if unassembling, negate quantity
 	if ($_POST['ProductionType'] == 0)
 		$_POST['quantity'] = -$_POST['quantity'];
@@ -154,7 +167,7 @@ if (isset($_POST['ProcessAndClose']) && can_process() == true)
 	 $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_']);
 }
 
 //-------------------------------------------------------------------------------------
@@ -173,7 +186,8 @@ 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));
 
@@ -191,7 +205,8 @@ textarea_row(_("Memo:"), 'memo_', null, 40, 3);
 
 end_table(1);
 
-submit_center('ProcessAndClose', _("Process And Close Order"), true, '', true);
+submit_center_first('Process', _("Process"), '', 'default');
+submit_center_last('ProcessAndClose', _("Process And Close Order"), '', true);
 
 end_form();