Merged changes from main trunk up to 2.2.7

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

diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php
index 2804ea1e1fc04627a99bfe1ec75cedf903826bdd..c23dc93f42ca7fe8977743f84c7fa11e27bf7311 100644 (file)
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.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(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
+page(_($help_context = "Produce or Unassemble Finished Items From Work Order"), false, false, "", $js);
 
 if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 {
@@ -39,7 +39,7 @@ if (isset($_GET['AddedID']))
 {
        include_once($path_to_root . "/reporting/includes/reporting.inc");
        $id = $_GET['AddedID'];
-       $stype = systypes::work_order();
+       $stype = ST_WORKORDER;
 
        display_notification(_("The manufacturing process has been entered."));
        
@@ -69,9 +69,9 @@ if (strlen($wo_details[0]) == 0)
 
 function can_process()
 {
-       global $wo_details;
+       global $wo_details, $SysPrefs, $Refs;
 
-       if (!references::is_valid($_POST['ref']))
+       if (!$Refs->is_valid($_POST['ref']))
        {
                display_error(_("You must enter a reference."));
                set_focus('ref');
@@ -104,7 +104,7 @@ function can_process()
                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 production date cannot be before the release date of the work order."));
                set_focus('date_');
@@ -112,12 +112,12 @@ function can_process()
        }
 
        // if unassembling we need to check the qoh
-       if (($_POST['ProductionType'] == 0) && !sys_prefs::allow_negative_stock())
+       if (($_POST['ProductionType'] == 0) && !$SysPrefs->allow_negative_stock())
        {
                $wo_details = get_work_order($_POST['selected_id']);
 
                $qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $_POST['date_']);
-               if (-$_POST['quantity'] + $qoh < 0)
+               if (-input_num('quantity') + $qoh < 0)
                {
                        display_error(_("The unassembling cannot be processed because there is insufficient stock."));
                        set_focus('quantity');
@@ -126,7 +126,7 @@ function can_process()
        }
 
        // if production we need to check the qoh of the wo requirements
-       if (($_POST['ProductionType'] == 1) && !sys_prefs::allow_negative_stock())
+       if (($_POST['ProductionType'] == 1) && !$SysPrefs->allow_negative_stock())
        {
        $err = false;
        $result = get_wo_requirements($_POST['selected_id']);
@@ -135,7 +135,7 @@ function can_process()
                        if ($row['mb_flag'] == 'D') // service, non stock
                                continue;
                        $qoh = get_qoh_on_date($row["stock_id"], $row["loc_code"], $_POST['date_']);
-                       if ($qoh - $row['units_req'] * $_POST['quantity'] < 0)
+                       if ($qoh - $row['units_req'] * input_num('quantity') < 0)
                        {
                        display_error( _("The production cannot be processed because a required item would cause a negative inventory balance :") .
                                " " . $row['stock_id'] . " - " .  $row['description']);
@@ -164,7 +164,7 @@ if ((isset($_POST['Process']) || isset($_POST['ProcessAndClose'])) && can_proces
        if ($_POST['ProductionType'] == 0)
                $_POST['quantity'] = -$_POST['quantity'];
 
-        $id = work_order_produce($_POST['selected_id'], $_POST['ref'], $_POST['quantity'],
+        $id = work_order_produce($_POST['selected_id'], $_POST['ref'], input_num('quantity'),
                        $_POST['date_'], $_POST['memo_'], $close_wo);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']."&date=".$_POST['date_']);
@@ -181,15 +181,14 @@ start_form();
 hidden('selected_id', $_POST['selected_id']);
 //hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
+$dec = get_qty_dec($wo_details["stock_id"]);
 if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
-{
-       $_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
-}
+       $_POST['quantity'] = qty_format(max($wo_details["units_reqd"] - $wo_details["units_issued"], 0), $wo_details["stock_id"], $dec);
 
 start_table($table_style2);
 br();
 
-ref_row(_("Reference:"), 'ref', '', references::get_next(29));
+ref_row(_("Reference:"), 'ref', '', $Refs->get_next(29));
 
 if (!isset($_POST['ProductionType']))
        $_POST['ProductionType'] = 1;
@@ -197,7 +196,7 @@ if (!isset($_POST['ProductionType']))
 yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
        _("Produce Finished Items"), _("Return Items to Work Order"));
 
-small_qty_row(_("Quantity:"), 'quantity', null, null, null, get_qty_dec($wo_details["stock_id"]));
+small_qty_row(_("Quantity:"), 'quantity', null, null, null, $dec);
 
 date_row(_("Date:"), 'date_');