X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=e6a18026d9e4907a6a2ac0cbe25f7262a325038f;hb=16ba695b81cd7283faa18372a74670415b562eb5;hp=1e78f7fee0e8ad0409fd3c2f4907a0fa52b82704;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 1e78f7fe..e6a18026 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -281,6 +281,11 @@ if (isset($_POST['close']))
 	meta_forward($_SERVER['PHP_SELF'], "ClosedID=$selected_id");
 }
 
+//-------------------------------------------------------------------------------------
+if (get_post('_type_update')) 
+{
+  $Ajax->activate('_page_body');
+}
 //-------------------------------------------------------------------------------------
 
 start_form();
@@ -289,6 +294,7 @@ start_table($table_style2);
 
 $existing_comments = "";
 
+$dec = 0;
 if (isset($selected_id))
 {
 	$myrow = get_work_order($selected_id);
@@ -308,18 +314,18 @@ if (isset($selected_id))
 	}
 
 	$_POST['wo_ref'] = $myrow["wo_ref"];
-	$_POST['quantity'] = qty_format($myrow["units_reqd"]);
+	$_POST['stock_id'] = $myrow["stock_id"];
+	$_POST['quantity'] = qty_format($myrow["units_reqd"], $_POST['stock_id'], $dec);
 	$_POST['StockLocation'] = $myrow["loc_code"];
 	$_POST['released'] = $myrow["released"];
 	$_POST['closed'] = $myrow["closed"];
-	$_POST['stock_id'] = $myrow["stock_id"];
 	$_POST['type'] = $myrow["type"];
 	$_POST['date_'] = sql2date($myrow["date_"]);
 	$_POST['RequDate'] = sql2date($myrow["required_by"]);
 	$_POST['released_date'] = sql2date($myrow["released_date"]);
 	$_POST['memo_'] = "";
 	$_POST['units_issued'] = $myrow["units_issued"];
-	$_POST['Costs'] = price_format($myrow["Costs"]);
+	$_POST['Costs'] = price_format($myrow["additional_costs"]);
 
 	$_POST['memo_'] = get_comments_string(systypes::work_order(), $selected_id);
 
@@ -333,6 +339,7 @@ if (isset($selected_id))
 
 	label_row(_("Reference:"), $_POST['wo_ref']);
 	label_row(_("Type:"), wo_types::name($_POST['type']));
+	hidden('type', $myrow["type"]);
 }
 else
 {
@@ -359,19 +366,19 @@ else
 }
 
 if (!isset($_POST['quantity']))
-	$_POST['quantity'] = qty_format(1);
+	$_POST['quantity'] = qty_format(1, $_POST['stock_id'], $dec);
 
 if (get_post('type') == wo_types::advanced())
 {
-    qty_row(_("Quantity Required:"), 'quantity', 12);
+    qty_row(_("Quantity Required:"), 'quantity', null, null, null, $dec);
     if ($_POST['released'])
-    	label_row(_("Quantity Manufactured:"), qty_format($_POST['units_issued']));
+    	label_row(_("Quantity Manufactured:"), number_format($_POST['units_issued'], get_qty_dec($_POST['stock_id'])));
     date_row(_("Date") . ":", 'date_');
 	date_row(_("Date Required By") . ":", 'RequDate', '', null, sys_prefs::default_wo_required_by());
 }
 else
 {
-    qty_row(_("Quantity:"), 'quantity', 12);
+    qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
     date_row(_("Date") . ":", 'date_');
 	hidden('RequDate', '');
 
@@ -388,20 +395,23 @@ textarea_row(_("Memo:"), 'memo_', null, 40, 5);
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
-
 if (isset($selected_id))
 {
-	echo "<br><br><table align=center><tr>";
+	echo "<table align=center><tr>";
 
+	submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), true);
 	if (isset($_POST['released']))
 	{
-		submit_cells('close', _("Close This Work Order"));
+		submit_cells('close', _("Close This Work Order"),'','',true);
 	}
-	submit_cells('delete', _("Delete This Work Order"));
+	submit_cells('delete', _("Delete This Work Order"),'','',true);
 
 	echo "</tr></table>";
 }
+else
+{
+	submit_center('ADD_ITEM', _("Add Workorder"), true, '', true);
+}
 
 end_form();
 end_page();