X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=049ab914527e0609b0de9e24ad6e0f3276dfc09e;hb=107a22ab168c1102f3f534a22cd5b8290331f17d;hp=d6bea933d76647788e1161a95238f55a52c8d4f3;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index d6bea933..049ab914 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -53,18 +53,19 @@ if (isset($_GET['AddedID']))
 
 	display_notification_centered(_("The work order been added."));
 
-    display_note(get_trans_view_str($stype, $id, _("View this Work Order")));
+    display_note(get_trans_view_str($stype, $id, _("View this Work Order")), 0, 1);
 
 	if ($_GET['type'] != WO_ADVANCED)
 	{
 		include_once($path_to_root . "/reporting/includes/reporting.inc");
-    	$ar = array('PARAM_0' => $id, 'PARAM_1' => $id, 'PARAM_2' => 0); 
-    	display_note(print_link(_("Print this Work Order"), 409, $ar), 1);
-    	$ar['PARAM_2'] = 1;
-    	display_note(print_link(_("Email this Work Order"), 409, $ar), 1);
+
+		submenu_print(_("&Print This Work Order"), ST_WORKORDER, $id, 'prtopt');
+		submenu_print(_("&Email This Work Order"), ST_WORKORDER, $id, null, 1);
     	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); 
+    	$ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype, 'PARAM_3' => '',
+    		'PARAM_4' => (isset($def_print_orientation) && $def_print_orientation == 1 ? 1 : 0)); 
     	display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1);
+		hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$stype&trans_no=$id");
 	}
 	
 	safe_exit();
@@ -202,8 +203,7 @@ function can_process()
 
                 		$quantity = $bom_item["quantity"] * input_num('quantity');
 
-                        $qoh = get_qoh_on_date($bom_item["component"], $bom_item["loc_code"], $_POST['date_']);
-                		if (-$quantity + $qoh < 0)
+                        if (check_negative_stock($bom_item["component"], -$quantity, $bom_item["loc_code"], $_POST['date_']))
                 		{
                 			display_error(_("The work order cannot be processed because there is an insufficient quantity for component:") .
                 				" " . $bom_item["component"] . " - " .  $bom_item["description"] . ".  " . _("Location:") . " " . $bom_item["location_name"]);
@@ -216,8 +216,7 @@ function can_process()
         	elseif ($_POST['type'] == WO_UNASSEMBLY)
         	{
         		// if unassembling, check item to unassemble
-				$qoh = get_qoh_on_date($_POST['stock_id'], $_POST['StockLocation'], $_POST['date_']);
-        		if (-input_num('quantity') + $qoh < 0)
+                if (check_negative_stock($_POST['stock_id'], -input_num('quantity'), $_POST['StockLocation'], $_POST['date_']))
         		{
         			display_error(_("The selected item cannot be unassembled because there is insufficient stock."));
 					return false;
@@ -326,7 +325,7 @@ if (get_post('_type_update'))
 
 start_form();
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 $existing_comments = "";
 
@@ -351,7 +350,8 @@ if (isset($selected_id))
 
 	$_POST['wo_ref'] = $myrow["wo_ref"];
 	$_POST['stock_id'] = $myrow["stock_id"];
-	$_POST['quantity'] = qty_format($myrow["units_reqd"], $_POST['stock_id'], $dec);
+	//$_POST['quantity'] = qty_format($myrow["units_reqd"], $_POST['stock_id'], $dec);
+	$_POST['quantity'] = $myrow["units_reqd"];
 	$_POST['StockLocation'] = $myrow["loc_code"];
 	$_POST['released'] = $myrow["released"];
 	$_POST['closed'] = $myrow["closed"];