X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=aaba58d4bca6b0979a59e1e9e3cc7641745e689d;hb=2571ca669208a2f17b0a5927c7bd8e688b8f3364;hp=39fd25bfe20c3bbe5ea0f85674482bed26dbbdc9;hpb=735b37b5d5be8650936a76a670b0aaa9c16dbf0e;p=fa-stable.git
diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 39fd25bf..aaba58d4 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_WORKORDERENTRY';
+$path_to_root = "..";
include_once($path_to_root . "/includes/session.inc");
@@ -13,9 +22,11 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
$js = "";
+if ($use_popup_windows)
+ $js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Work Order Entry"), false, false, "", $js);
+page(_($help_context = "Work Order Entry"), false, false, "", $js);
check_db_has_manufacturable_items(_("There are no manufacturable items defined in the system."));
@@ -38,9 +49,24 @@ elseif(isset($_POST['selected_id']))
if (isset($_GET['AddedID']))
{
$id = $_GET['AddedID'];
+ $stype = ST_WORKORDER;
display_notification_centered(_("The work order been added."));
+ display_note(get_trans_view_str($stype, $id, _("View this Work Order")));
+
+ 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);
+ 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);
+ display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1);
+ }
+
safe_exit();
}
@@ -82,87 +108,88 @@ function safe_exit()
hyperlink_no_params("", _("Enter a new work order"));
hyperlink_no_params("search_work_orders.php", _("Select an existing work order"));
- echo "
";
- end_form();
- end_page();
- exit;
+
+ display_footer_exit();
}
//-------------------------------------------------------------------------------------
if (!isset($_POST['date_']))
{
- $_POST['date_'] = Today();
+ $_POST['date_'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['date_']))
$_POST['date_'] = end_fiscalyear();
}
function can_process()
{
- global $selected_id;
+ global $selected_id, $SysPrefs, $Refs;
if (!isset($selected_id))
{
- if (!references::is_valid($_POST['wo_ref']))
+ if (!$Refs->is_valid($_POST['wo_ref']))
{
display_error(_("You must enter a reference."));
+ set_focus('wo_ref');
return false;
}
- if (!is_new_reference($_POST['wo_ref'], systypes::work_order()))
+ if (!is_new_reference($_POST['wo_ref'], ST_WORKORDER))
{
display_error(_("The entered reference is already in use."));
+ set_focus('wo_ref');
return false;
}
}
- if (!is_numeric($_POST['quantity']))
- {
- display_error( _("The quantity entered must be numeric."));
- return false;
- }
-
- if ($_POST['quantity'] <= 0)
+ if (!check_num('quantity', 0))
{
- display_error( _("The quantity entered must be a positive number greater than zero."));
+ display_error( _("The quantity entered is invalid or less than zero."));
+ set_focus('quantity');
return false;
}
if (!is_date($_POST['date_']))
{
display_error( _("The date entered is in an invalid format."));
+ set_focus('date_');
return false;
}
elseif (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('date_');
return false;
}
// only check bom and quantites if quick assembly
- if (!($_POST['type'] == wo_types::advanced()))
+ if (!($_POST['type'] == WO_ADVANCED))
{
if (!has_bom($_POST['stock_id']))
{
display_error(_("The selected item to manufacture does not have a bom."));
+ set_focus('stock_id');
return false;
}
- if ($_POST['Costs'] == "")
- $_POST['Costs'] = 0;
- if (!is_numeric($_POST['Costs']))
+ if ($_POST['Labour'] == "")
+ $_POST['Labour'] = price_format(0);
+ if (!check_num('Labour', 0))
{
- display_error( _("The cost entered must be numeric."));
+ display_error( _("The labour cost entered is invalid or less than zero."));
+ set_focus('Labour');
return false;
}
-
- if ($_POST['Costs'] < 0)
+ if ($_POST['Costs'] == "")
+ $_POST['Costs'] = price_format(0);
+ if (!check_num('Costs', 0))
{
- display_error( _("The cost entered cannot be negative."));
+ display_error( _("The cost entered is invalid or less than zero."));
+ set_focus('Costs');
return false;
}
- if (!sys_prefs::allow_negative_stock())
+ if (!$SysPrefs->allow_negative_stock())
{
- if ($_POST['type'] == wo_types::assemble())
+ if ($_POST['type'] == WO_ASSEMBLY)
{
// check bom if assembling
$result = get_bom($_POST['stock_id']);
@@ -173,23 +200,24 @@ function can_process()
if (has_stock_holding($bom_item["ResourceType"]))
{
- $quantity = $bom_item["quantity"] * $_POST['quantity'];
+ $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)
{
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"]);
+ set_focus('quantity');
return false;
}
}
}
}
- elseif ($_POST['type'] == wo_types::unassemble())
+ elseif ($_POST['type'] == WO_UNASSEMBLY)
{
// if unassembling, check item to unassemble
$qoh = get_qoh_on_date($_POST['stock_id'], $_POST['StockLocation'], $_POST['date_']);
- if (-$_POST['quantity'] + $qoh < 0)
+ if (-input_num('quantity') + $qoh < 0)
{
display_error(_("The selected item cannot be unassembled because there is insufficient stock."));
return false;
@@ -201,6 +229,7 @@ function can_process()
{
if (!is_date($_POST['RequDate']))
{
+ set_focus('RequDate');
display_error( _("The date entered is in an invalid format."));
return false;
}
@@ -213,8 +242,9 @@ function can_process()
{
$myrow = get_work_order($selected_id, true);
- if ($_POST['units_issued'] > $_POST['quantity'])
+ if ($_POST['units_issued'] > input_num('quantity'))
{
+ set_focus('quantity');
display_error(_("The quantity cannot be changed to be less than the quantity already manufactured for this order."));
return false;
}
@@ -228,12 +258,16 @@ function can_process()
if (isset($_POST['ADD_ITEM']) && can_process())
{
-
- $id = add_work_order($_POST['wo_ref'], $_POST['StockLocation'], $_POST['quantity'],
+ if (!isset($_POST['cr_acc']))
+ $_POST['cr_acc'] = "";
+ if (!isset($_POST['cr_lab_acc']))
+ $_POST['cr_lab_acc'] = "";
+ $id = add_work_order($_POST['wo_ref'], $_POST['StockLocation'], input_num('quantity'),
$_POST['stock_id'], $_POST['type'], $_POST['date_'],
- $_POST['RequDate'], $_POST['Costs'], $_POST['memo_']);
+ $_POST['RequDate'], $_POST['memo_'], input_num('Costs'), $_POST['cr_acc'], input_num('Labour'), $_POST['cr_lab_acc']);
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$id");
+ new_doc_date($_POST['date_']);
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$id&type=".$_POST['type']."&date=".$_POST['date_']);
}
//-------------------------------------------------------------------------------------
@@ -241,9 +275,9 @@ if (isset($_POST['ADD_ITEM']) && can_process())
if (isset($_POST['UPDATE_ITEM']) && can_process())
{
- update_work_order($selected_id, $_POST['StockLocation'], $_POST['quantity'],
+ 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");
}
@@ -283,14 +317,20 @@ if (isset($_POST['close']))
meta_forward($_SERVER['PHP_SELF'], "ClosedID=$selected_id");
}
+//-------------------------------------------------------------------------------------
+if (get_post('_type_update'))
+{
+ $Ajax->activate('_page_body');
+}
//-------------------------------------------------------------------------------------
start_form();
-start_table($table_style2);
+start_table(TABLESTYLE2);
$existing_comments = "";
+$dec = 0;
if (isset($selected_id))
{
$myrow = get_work_order($selected_id);
@@ -310,20 +350,20 @@ if (isset($selected_id))
}
$_POST['wo_ref'] = $myrow["wo_ref"];
- $_POST['quantity'] = $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'] = $myrow["Costs"];
+ $_POST['Costs'] = price_format($myrow["additional_costs"]);
- $_POST['memo_'] = get_comments_string(systypes::work_order(), $selected_id);
+ $_POST['memo_'] = get_comments_string(ST_WORKORDER, $selected_id);
hidden('wo_ref', $_POST['wo_ref']);
hidden('units_issued', $_POST['units_issued']);
@@ -334,17 +374,18 @@ if (isset($selected_id))
hidden('old_stk_id', $myrow["stock_id"]);
label_row(_("Reference:"), $_POST['wo_ref']);
- label_row(_("Type:"), wo_types::name($_POST['type']));
+ label_row(_("Type:"), $wo_types_array[$_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', '', $Refs->get_next(ST_WORKORDER));
- wo_types_list_row(_("Type:"), 'type', $_POST['type']);
+ wo_types_list_row(_("Type:"), 'type', null);
}
-if ($_POST['released'] == true)
+if (get_post('released'))
{
hidden('stock_id', $_POST['stock_id']);
hidden('StockLocation', $_POST['StockLocation']);
@@ -355,55 +396,77 @@ if ($_POST['released'] == true)
}
else
{
- stock_manufactured_items_list_row(_("Item:"), 'stock_id', null);
+ stock_manufactured_items_list_row(_("Item:"), 'stock_id', null, false, true);
+ if (list_updated('stock_id'))
+ $Ajax->activate('quantity');
locations_list_row(_("Destination Location:"), 'StockLocation', null);
}
if (!isset($_POST['quantity']))
- $_POST['quantity'] = 1;
+ $_POST['quantity'] = qty_format(1, $_POST['stock_id'], $dec);
+else
+ $_POST['quantity'] = qty_format($_POST['quantity'], $_POST['stock_id'], $dec);
+
-if ($_POST['type'] == wo_types::advanced())
+if (get_post('type') == WO_ADVANCED)
{
- text_row_ex(_("Quantity Required:"), 'quantity', 12);
+ qty_row(_("Quantity Required:"), 'quantity', null, null, null, $dec);
if ($_POST['released'])
- label_row(_("Quantity Manufactured:"), $_POST['units_issued']);
- date_row(_("Date") . ":", 'date_');
- date_row(_("Date Required By") . ":", 'RequDate', null, sys_prefs::default_wo_required_by());
+ 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, $SysPrefs->default_wo_required_by());
}
else
{
- text_row_ex(_("Quantity:"), 'quantity', 12);
- date_row(_("Date") . ":", 'date_');
+ qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
+ date_row(_("Date") . ":", 'date_', '', true);
hidden('RequDate', '');
+ $sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts";
+ $rs = db_query($sql,"could not get bank accounts");
+ $r = db_fetch_row($rs);
+ if (!isset($_POST['Labour']))
+ {
+ $_POST['Labour'] = price_format(0);
+ $_POST['cr_lab_acc'] = $r[0];
+ }
+ amount_row($wo_cost_types[WO_LABOUR], 'Labour');
+ gl_all_accounts_list_row(_("Credit Labour Account"), 'cr_lab_acc', null);
if (!isset($_POST['Costs']))
- $_POST['Costs'] = 0;
-
- amount_row(_("Total Additional Costs:"), 'Costs');
+ {
+ $_POST['Costs'] = price_format(0);
+ $_POST['cr_acc'] = $r[0];
+ }
+ amount_row($wo_cost_types[WO_OVERHEAD], 'Costs');
+ gl_all_accounts_list_row(_("Credit Overhead Account"), 'cr_acc', null);
+
}
-if ($_POST['released'])
+if (get_post('released'))
label_row(_("Released On:"),$_POST['released_date']);
textarea_row(_("Memo:"), 'memo_', null, 40, 5);
end_table(1);
-submit_add_or_update_center(!isset($selected_id));
-
if (isset($selected_id))
{
- echo "
";
+ echo "";
- if (isset($_POST['released']))
+ submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), 'default');
+ if (get_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 "
";
}
+else
+{
+ submit_center('ADD_ITEM', _("Add Workorder"), true, '', 'default');
+}
end_form();
end_page();