Moving bugfixes from 2.3 to 2.4 and updated install languages for Denmark and Sweden.

[fa-stable.git] / manufacturing / work_order_costs.php

diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index 4e7f05379b275601ee566f21911018e46e2dccc9..eb089384547bf86a92eef22588ae0ccb1ea47da6 100644 (file)
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -12,19 +12,18 @@
 $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(_($help_context = "Work Order Additional Costs"), false, false, "", $js);
 
@@ -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;
@@ -69,7 +69,7 @@ if (strlen($wo_details[0]) == 0)
 function can_process()
 {
        global $wo_details;
-
+       
        if (!check_num('costs', 0))
        {
                display_error(_("The amount entered is not a valid number or less then zero."));
@@ -85,7 +85,7 @@ 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;
        }
@@ -103,9 +103,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,10 +116,17 @@ 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']);
+                       
+       //Apply the costs to manfuctured stock item as adjustement
+       $wo = get_work_order($_POST['selected_id']);
+       if ($_POST['PaymentType'] == 0)
+               add_labour_cost($wo['stock_id'], $wo['units_reqd'], $_POST['date_'], input_num('costs'), true);
+       else
+               add_overhead_cost($wo['stock_id'], $wo['units_reqd'], $_POST['date_'], input_num('costs'), true);
+                       
        commit_transaction();   
-
        meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']);
 }
 
@@ -128,30 +136,33 @@ display_wo_details($_POST['selected_id']);
 
 //-------------------------------------------------------------------------------------
 
+if (!isset($_POST['ref']))
+       $_POST['ref'] = $Refs->get_next(ST_JOURNAL, null, get_post('date_'));
+
 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]);
 
 $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');
 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"]);
@@ -162,4 +173,3 @@ end_form();
 
 end_page();
 
-?>
\ No newline at end of file