X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=manufacturing%2Fwork_order_costs.php;h=50e7f7feaf9309922c60f650c768439d95775ca0;hb=181cd75a7b027c398cc382974bc9f97cba8c48b3;hp=7ce5e811c67bde915492f986b2564dd0bfe31848;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index 7ce5e811..50e7f7fe 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -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 Additional Costs"), false, false, "", $js); +page(_($help_context = "Work Order Additional Costs"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { @@ -49,6 +49,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; @@ -103,9 +104,10 @@ function can_process() if (isset($_POST['process']) && can_process() == true) { + $date = $_POST['date_']; begin_transaction(); add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'], - 0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType']); + 0, 0, $date.": ".$wo_cost_types[$_POST['PaymentType']], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType']); $is_bank_to = is_bank_account($_POST['cr_acc']); if ($is_bank_to) { @@ -115,7 +117,7 @@ if (isset($_POST['process']) && can_process() == true) } add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'], - $_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, + $_POST['dim1'], $_POST['dim2'], $date.": ".$wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, $_POST['PaymentType']); commit_transaction(); @@ -133,7 +135,7 @@ start_form(); hidden('selected_id', $_POST['selected_id']); //hidden('WOReqQuantity', $_POST['WOReqQuantity']); -start_table($table_style2); +start_table(TABLESTYLE2); br(); @@ -143,9 +145,7 @@ date_row(_("Date:"), 'date_'); $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); +$r = get_default_bank_account(get_company_pref('curr_default')); $_POST['cr_acc'] = $r[0]; amount_row(_("Additional Costs:"), 'costs');