X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=a0282ed2e46c75ec1ff21fccee36f79cc2cf99d6;hb=eb5b2d3ee7cc0fca5ec63dfada65ecf23b693e85;hp=28d00f2935a3786cf0f84a02efb6a9096641f04b;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git
diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 28d00f29..a0282ed2 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 10;
$path_to_root="..";
@@ -91,7 +100,7 @@ function safe_exit()
//-------------------------------------------------------------------------------------
if (!isset($_POST['date_']))
{
- $_POST['date_'] = Today();
+ $_POST['date_'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['date_']))
$_POST['date_'] = end_fiscalyear();
}
@@ -230,7 +239,7 @@ if (isset($_POST['ADD_ITEM']) && can_process())
$id = add_work_order($_POST['wo_ref'], $_POST['StockLocation'], input_num('quantity'),
$_POST['stock_id'], $_POST['type'], $_POST['date_'],
$_POST['RequDate'], input_num('Costs'), $_POST['memo_']);
-
+ new_doc_date($_POST['date_']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$id");
}
@@ -241,7 +250,7 @@ if (isset($_POST['UPDATE_ITEM']) && can_process())
update_work_order($selected_id, $_POST['StockLocation'], input_num('quantity'),
$_POST['stock_id'], $_POST['date_'], $_POST['RequDate'], $_POST['memo_']);
-
+ new_doc_date($_POST['date_']);
meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
}
@@ -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,14 +381,14 @@ 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']));
- date_row(_("Date") . ":", 'date_');
+ label_row(_("Quantity Manufactured:"), number_format($_POST['units_issued'], get_qty_dec($_POST['stock_id'])));
+ date_row(_("Date") . ":", 'date_', '', true);
date_row(_("Date Required By") . ":", 'RequDate', '', null, sys_prefs::default_wo_required_by());
}
else
{
qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
- date_row(_("Date") . ":", 'date_');
+ date_row(_("Date") . ":", 'date_', '', true);
hidden('RequDate', '');
if (!isset($_POST['Costs']))
@@ -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 "