X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_add_finished.php;h=acf67f73e197ef7e0621795772b40b17426a1893;hb=46ca4e0e56786a05c0b16ce02fb6f9a3de334eab;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..acf67f73 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");
 
@@ -25,7 +26,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($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'] != "")
 {
@@ -36,10 +37,20 @@ 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"));
+	br();
 
 	end_page();
 	exit;
@@ -59,9 +70,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,20 +105,26 @@ 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_');
 		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"], $date_);
-		if (-$_POST['quantity'] + $qoh < 0)
+		$qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $_POST['date_']);
+		if (-input_num('quantity') + $qoh < 0)
 		{
 			display_error(_("The unassembling cannot be processed because there is insufficient stock."));
 			set_focus('quantity');
@@ -116,7 +133,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']);
@@ -124,8 +141,8 @@ function can_process()
 		{
 			if ($row['mb_flag'] == 'D') // service, non stock
 				continue;
-			$qoh = get_qoh_on_date($row["stock_id"], $row["loc_code"], $date_);
-			if ($qoh - $row['units_req'] * $_POST['quantity'] < 0)
+			$qoh = get_qoh_on_date($row["stock_id"], $row["loc_code"], $_POST['date_']);
+			if ($qoh - $row['units_req'] * input_num('quantity') < 0)
 			{
     			display_error( _("The production cannot be processed because a required item would cause a negative inventory balance :") .
     				" " . $row['stock_id'] . " - " .  $row['description']);
@@ -143,18 +160,21 @@ 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'];
 
-	 $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=$id");
+	meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']."&date=".$_POST['date_']);
 }
 
 //-------------------------------------------------------------------------------------
@@ -168,14 +188,14 @@ 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();
+start_table(TABLESTYLE2);
+br();
 
-ref_row(_("Reference:"), 'ref', '', references::get_next(29));
+ref_row(_("Reference:"), 'ref', '', $Refs->get_next(29));
 
 if (!isset($_POST['ProductionType']))
 	$_POST['ProductionType'] = 1;
@@ -183,7 +203,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"]));
+small_qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
 
 date_row(_("Date:"), 'date_');
 
@@ -191,7 +211,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();