X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fwork_order_costs.php;h=07efe640b339af563932e2edc0fb97d4a4911c50;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=0d68a3f9db4e9413aac25c93f6a3b04bb999532b;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index 0d68a3f9..07efe640 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -9,24 +9,23 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_WORKORDERCOST'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/inventory.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); 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) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_("Work Order Additional Costs"), false, false, "", $js); +page(_($help_context = "Work Order Additional Costs"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { @@ -38,7 +37,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") if (isset($_GET['AddedID'])) { $id = $_GET['AddedID']; - $stype = systypes::work_order(); + $stype = ST_WORKORDER; display_notification(_("The additional cost has been entered.")); @@ -49,6 +48,7 @@ if (isset($_GET['AddedID'])) hyperlink_params("work_order_costs.php", _("Enter another additional cost."), "trans_no=$id"); hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process")); + br(); end_page(); exit; @@ -56,9 +56,9 @@ if (isset($_GET['AddedID'])) //-------------------------------------------------------------------------------------------------- -$wo_details = get_work_order($_POST['selected_id']); +$wo_details = get_work_order($_POST['selected_id'], true); -if (strlen($wo_details[0]) == 0) +if ($wo_details === false) { display_error(_("The order number sent is not valid.")); exit; @@ -66,11 +66,9 @@ if (strlen($wo_details[0]) == 0) //-------------------------------------------------------------------------------------------------- -function can_process() +function can_process($wo_details) { - global $wo_details; - - if (!check_num('costs', 0)) + if (input_num('costs')<=0) { display_error(_("The amount entered is not a valid number or less then zero.")); set_focus('costs'); @@ -85,11 +83,11 @@ function can_process() } elseif (!is_date_in_fiscalyear($_POST['date_'])) { - display_error(_("The entered date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('date_'); return false; } - if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) + if (date_diff2(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) { display_error(_("The additional cost date cannot be before the release date of the work order.")); set_focus('date_'); @@ -101,23 +99,14 @@ function can_process() //-------------------------------------------------------------------------------------------------- -if (isset($_POST['process']) && can_process() == true) +if (isset($_POST['process']) && can_process($wo_details) == true) { - begin_transaction(); - add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'], - 0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType']); - $is_bank_to = is_bank_account($_POST['cr_acc']); - if ($is_bank_to) - { - add_bank_trans(systypes::work_order(), $_POST['selected_id'], $is_bank_to, "", - $_POST['date_'], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType'], get_company_currency(), - "Cannot insert a destination bank transaction"); - } + $date = $_POST['date_']; + $memo = $_POST['memo']; + $ref = $_POST['ref']; - add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'], - $_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), payment_person_types::WorkOrder(), - $_POST['PaymentType']); - commit_transaction(); + add_wo_costs_journal($_POST['selected_id'], input_num('costs'), $_POST['PaymentType'], + $_POST['cr_acc'], $date, $_POST['dim1'], $_POST['dim2'], $memo, $ref); meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']); } @@ -128,33 +117,37 @@ display_wo_details($_POST['selected_id']); //------------------------------------------------------------------------------------- +if (!isset($_POST['ref'])) + $_POST['ref'] = $Refs->get_next(ST_JOURNAL, null, Today()); + start_form(); hidden('selected_id', $_POST['selected_id']); //hidden('WOReqQuantity', $_POST['WOReqQuantity']); -start_table($table_style2); +start_table(TABLESTYLE2); br(); -yesno_list_row(_("Type:"), 'PaymentType', null, $wo_cost_types[WO_OVERHEAD], $wo_cost_types[WO_LABOUR]); date_row(_("Date:"), 'date_'); +ref_row(_("Reference:"), 'ref', ''); + +yesno_list_row(_("Type:"), 'PaymentType', null, $wo_cost_types[WO_OVERHEAD], $wo_cost_types[WO_LABOUR], true); +if (list_updated('PaymentType')) + $Ajax->activate('costs'); -$item_accounts = get_stock_gl_code($wo_details['stock_id']); -$_POST['db_acc'] = $item_accounts['assembly_account']; -$sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts"; -$rs = db_query($sql,"could not get bank accounts"); -$r = db_fetch_row($rs); -$_POST['cr_acc'] = $r[0]; +$item = get_item($wo_details['stock_id']); +$r = get_default_bank_account(get_company_pref('curr_default')); +$_POST['cr_acc'] = $r['account_code']; +$_POST['costs'] = price_format(get_post('PaymentType')==WO_OVERHEAD ? $item['overhead_cost'] : $item['labour_cost']); amount_row(_("Additional Costs:"), 'costs'); -gl_all_accounts_list_row(_("Debit Account"), 'db_acc', null); gl_all_accounts_list_row(_("Credit Account"), 'cr_acc', null); - +textarea_row(_("Memo:"), 'memo', null, 40, 5); end_table(1); -hidden('dim1', $item_accounts["dimension_id"]); -hidden('dim2', $item_accounts["dimension2_id"]); +hidden('dim1', $item["dimension_id"]); +hidden('dim2', $item["dimension2_id"]); submit_center('process', _("Process Additional Cost"), true, '', true); @@ -162,4 +155,3 @@ end_form(); end_page(); -?> \ No newline at end of file