X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=c4d3dd5d1a64054dc5d6db0589ee7921faee10f2;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=28d00f2935a3786cf0f84a02efb6a9096641f04b;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 28d00f29..c4d3dd5d 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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="..";
 
@@ -281,6 +290,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 +303,7 @@ start_table($table_style2);
 
 $existing_comments = "";
 
+$dec = 0;
 if (isset($selected_id))
 {
 	$myrow = get_work_order($selected_id);
@@ -319,7 +334,7 @@ if (isset($selected_id))
 	$_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 +348,7 @@ if (isset($selected_id))
 
 	label_row(_("Reference:"), $_POST['wo_ref']);
 	label_row(_("Type:"), wo_types::name($_POST['type']));
+	hidden('type', $myrow["type"]);
 }
 else
 {
@@ -365,7 +381,7 @@ if (get_post('type') == wo_types::advanced())
 {
     qty_row(_("Quantity Required:"), 'quantity', null, null, null, $dec);
     if ($_POST['released'])
-    	label_row(_("Quantity Manufactured:"), qty_format($_POST['units_issued'], $_POST['stock_id']));
+    	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());
 }
@@ -388,20 +404,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();