X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_entry.php;h=049ab914527e0609b0de9e24ad6e0f3276dfc09e;hb=a3b394e516743dba27de10a7aa1f31aa5596e117;hp=b30209fc984fca9f5bcc04172c8ce828fd366583;hpb=3dc709543cc713810811d269a8b2ce035146a559;p=fa-stable.git diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index b30209fc..049ab914 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_WORKORDERENTRY'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); @@ -26,7 +26,7 @@ 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.")); @@ -49,18 +49,23 @@ elseif(isset($_POST['selected_id'])) if (isset($_GET['AddedID'])) { $id = $_GET['AddedID']; - $stype = systypes::work_order(); + $stype = ST_WORKORDER; display_notification_centered(_("The work order been added.")); - display_note(get_trans_view_str($stype, $id, _("View this Work Order"))); + display_note(get_trans_view_str($stype, $id, _("View this Work Order")), 0, 1); - if ($_GET['type'] != wo_types::advanced()) + if ($_GET['type'] != WO_ADVANCED) { include_once($path_to_root . "/reporting/includes/reporting.inc"); + + submenu_print(_("&Print This Work Order"), ST_WORKORDER, $id, 'prtopt'); + submenu_print(_("&Email This Work Order"), ST_WORKORDER, $id, null, 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); + $ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype, 'PARAM_3' => '', + 'PARAM_4' => (isset($def_print_orientation) && $def_print_orientation == 1 ? 1 : 0)); display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1); + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$stype&trans_no=$id"); } safe_exit(); @@ -111,25 +116,25 @@ 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(); } 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'); @@ -157,7 +162,7 @@ function can_process() 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'])) { @@ -183,9 +188,9 @@ function can_process() 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']); @@ -198,8 +203,7 @@ function can_process() $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) + if (check_negative_stock($bom_item["component"], -$quantity, $bom_item["loc_code"], $_POST['date_'])) { 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"]); @@ -209,11 +213,10 @@ function can_process() } } } - 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 (-input_num('quantity') + $qoh < 0) + if (check_negative_stock($_POST['stock_id'], -input_num('quantity'), $_POST['StockLocation'], $_POST['date_'])) { display_error(_("The selected item cannot be unassembled because there is insufficient stock.")); return false; @@ -254,11 +257,15 @@ function can_process() if (isset($_POST['ADD_ITEM']) && can_process()) { - + 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['memo_'], input_num('Costs'), $_POST['cr_acc'], input_num('Labour'), $_POST['cr_lab_acc']); + new_doc_date($_POST['date_']); meta_forward($_SERVER['PHP_SELF'], "AddedID=$id&type=".$_POST['type']."&date=".$_POST['date_']); } @@ -269,7 +276,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"); } @@ -318,7 +325,7 @@ if (get_post('_type_update')) start_form(); -start_table($table_style2); +start_table(TABLESTYLE2); $existing_comments = ""; @@ -343,7 +350,8 @@ if (isset($selected_id)) $_POST['wo_ref'] = $myrow["wo_ref"]; $_POST['stock_id'] = $myrow["stock_id"]; - $_POST['quantity'] = qty_format($myrow["units_reqd"], $_POST['stock_id'], $dec); + //$_POST['quantity'] = qty_format($myrow["units_reqd"], $_POST['stock_id'], $dec); + $_POST['quantity'] = $myrow["units_reqd"]; $_POST['StockLocation'] = $myrow["loc_code"]; $_POST['released'] = $myrow["released"]; $_POST['closed'] = $myrow["closed"]; @@ -355,7 +363,7 @@ if (isset($selected_id)) $_POST['units_issued'] = $myrow["units_issued"]; $_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']); @@ -366,18 +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', null); } -if ($_POST['released'] == true) +if (get_post('released')) { hidden('stock_id', $_POST['stock_id']); hidden('StockLocation', $_POST['StockLocation']); @@ -388,26 +396,31 @@ 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'] = qty_format(1, $_POST['stock_id'], $dec); +else + $_POST['quantity'] = qty_format($_POST['quantity'], $_POST['stock_id'], $dec); + -if (get_post('type') == wo_types::advanced()) +if (get_post('type') == WO_ADVANCED) { qty_row(_("Quantity Required:"), 'quantity', null, null, null, $dec); if ($_POST['released']) 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") . ":", 'date_', '', true); + date_row(_("Date Required By") . ":", 'RequDate', '', null, $SysPrefs->default_wo_required_by()); } else { qty_row(_("Quantity:"), 'quantity', null, null, null, $dec); - date_row(_("Date") . ":", 'date_'); + date_row(_("Date") . ":", 'date_', '', true); hidden('RequDate', ''); $sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts"; @@ -430,7 +443,7 @@ else } -if ($_POST['released']) +if (get_post('released')) label_row(_("Released On:"),$_POST['released_date']); textarea_row(_("Memo:"), 'memo_', null, 40, 5); @@ -441,8 +454,8 @@ if (isset($selected_id)) { echo ""; - submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), true); - 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"),'','',true); } @@ -452,7 +465,7 @@ if (isset($selected_id)) } else { - submit_center('ADD_ITEM', _("Add Workorder"), true, '', true); + submit_center('ADD_ITEM', _("Add Workorder"), true, '', 'default'); } end_form();