Merging latest changes from stable branch up to 2.3.24

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

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index 68b10f6a57a14f2e7e70396538c2a6e79a4a5894..ccc2635e3ecb86dbb458e85f10862d21df4182d0 100644 (file)
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -15,16 +15,15 @@ $path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.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 Entry"), false, false, "", $js);
 
@@ -53,18 +52,19 @@ if (isset($_GET['AddedID']))
 
        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_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);
+
+               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' => (user_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();
@@ -202,8 +202,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"]);
@@ -216,8 +215,7 @@ function can_process()
                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;
@@ -276,7 +274,8 @@ 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_']);
+               $_POST['stock_id'],  $_POST['date_'], $_POST['RequDate'], $_POST['memo_'],
+               $_POST['old_stk_id'], $_POST['old_qty']);
        new_doc_date($_POST['date_']);
        meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
 }
@@ -302,7 +301,7 @@ if (isset($_POST['delete']))
        { //ie not cancelled the delete as a result of above tests
 
                // delete the actual work order
-               delete_work_order($selected_id);
+               delete_work_order($selected_id, $_POST['stock_id'], $_POST['quantity'], $_POST['date_']);
                meta_forward($_SERVER['PHP_SELF'], "DeletedID=$selected_id");
        }
 }
@@ -351,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"];
@@ -423,24 +423,23 @@ else
     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);
+       $bank_act = get_default_bank_account();
        if (!isset($_POST['Labour']))
        {
                $_POST['Labour'] = price_format(0);
-               $_POST['cr_lab_acc'] = $r[0];
+               $_POST['cr_lab_acc'] = $bank_act['account_code'];
        }
+
        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'] = price_format(0);
-               $_POST['cr_acc'] = $r[0];
+               $_POST['cr_acc'] = $bank_act['account_code'];
        }
        amount_row($wo_cost_types[WO_OVERHEAD], 'Costs');
        gl_all_accounts_list_row(_("Credit Overhead Account"), 'cr_acc', null);
-       
+
 }
 
 if (get_post('released'))
@@ -471,4 +470,3 @@ else
 end_form();
 end_page();
 
-?>
\ No newline at end of file