X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=c4d3dd5d1a64054dc5d6db0589ee7921faee10f2;hb=499e0e615d1a845c6c519754b3a213fdda0513ba;hp=1a192ef03fa33d50e9477e53dc4351951febdcee;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git
diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 1a192ef0..c4d3dd5d 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$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);
@@ -308,18 +323,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,13 +348,14 @@ if (isset($selected_id))
label_row(_("Reference:"), $_POST['wo_ref']);
label_row(_("Type:"), wo_types::name($_POST['type']));
+ hidden('type', $myrow["type"]);
}
else
{
$_POST['units_issued'] = $_POST['released'] = 0;
- ref_row(_("Reference:"), 'wo_ref', references::get_next(systypes::work_order()));
+ ref_row(_("Reference:"), 'wo_ref', '', references::get_next(systypes::work_order()));
- wo_types_list_row(_("Type:"), 'type', $_POST['type']);
+ wo_types_list_row(_("Type:"), 'type', null);
}
if ($_POST['released'] == true)
@@ -359,19 +375,19 @@ else
}
if (!isset($_POST['quantity']))
- $_POST['quantity'] = qty_format(1);
+ $_POST['quantity'] = qty_format(1, $_POST['stock_id'], $dec);
-if ($_POST['type'] == wo_types::advanced())
+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());
+ 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 +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 "