Better layout in Form setup

[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 9cb5607466e9f1819bc307f294a681a821b3171f..ea4af88402b5da3bf48fcf511ccbeb70b5b46082 100644 (file)
--- a/manufacturing/work_order_add_finished.php
+++ b/manufacturing/work_order_add_finished.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -12,6 +21,8 @@ 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)
+       $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);
@@ -23,12 +34,12 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "")
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_GET['AddedID'])) 
+if (isset($_GET['AddedID']))
 {
 
        display_note(_("The manufacturing process has been entered."));
 
-       hyperlink_no_params("search_work_orders.php", _("Select another Work Order to Process"));
+       hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process"));
 
        end_page();
        exit;
@@ -38,7 +49,7 @@ if (isset($_GET['AddedID']))
 
 $wo_details = get_work_order($_POST['selected_id']);
 
-if (strlen($wo_details[0]) == 0) 
+if (strlen($wo_details[0]) == 0)
 {
        display_error(_("The order number sent is not valid."));
        exit;
@@ -50,14 +61,14 @@ function can_process()
 {
        global $wo_details;
 
-       if (!references::is_valid($_POST['ref'])) 
+       if (!references::is_valid($_POST['ref']))
        {
                display_error(_("You must enter a reference."));
                set_focus('ref');
                return false;
        }
 
-       if (!is_new_reference($_POST['ref'], 29)) 
+       if (!is_new_reference($_POST['ref'], 29))
        {
                display_error(_("The entered reference is already in use."));
                set_focus('ref');
@@ -76,14 +87,14 @@ function can_process()
                display_error(_("The entered date is invalid."));
                set_focus('date_');
                return false;
-       } 
-       elseif (!is_date_in_fiscalyear($_POST['date_'])) 
+       }
+       elseif (!is_date_in_fiscalyear($_POST['date_']))
        {
                display_error(_("The entered date is not in fiscal year."));
                set_focus('date_');
                return false;
        }
-       if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) 
+       if (date_diff(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_');
@@ -96,7 +107,7 @@ function can_process()
                $wo_details = get_work_order($_POST['selected_id']);
 
                $qoh = get_qoh_on_date($wo_details["stock_id"], $wo_details["loc_code"], $date_);
-               if (-$_POST['quantity'] + $qoh < 0) 
+               if (-$_POST['quantity'] + $qoh < 0)
                {
                        display_error(_("The unassembling cannot be processed because there is insufficient stock."));
                        set_focus('quantity');
@@ -109,7 +120,7 @@ function can_process()
 
 //--------------------------------------------------------------------------------------------------
 
-if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true)) 
+if (isset($_POST['Process']) || (isset($_POST['ProcessAndClose']) && can_process() == true))
 {
 
        $close_wo = 0;
@@ -137,14 +148,14 @@ start_form();
 hidden('selected_id', $_POST['selected_id']);
 //hidden('WOReqQuantity', $_POST['WOReqQuantity']);
 
-if (!isset($_POST['quantity']) || $_POST['quantity'] == '') 
+if (!isset($_POST['quantity']) || $_POST['quantity'] == '')
 {
        $_POST['quantity'] = max($wo_details["units_reqd"] - $wo_details["units_issued"], 0);
 }
 
 start_table();
 
-ref_row(_("Reference:"), 'ref', references::get_next(29));
+ref_row(_("Reference:"), 'ref', '', references::get_next(29));
 
 if (!isset($_POST['ProductionType']))
        $_POST['ProductionType'] = 1;
@@ -152,7 +163,7 @@ if (!isset($_POST['ProductionType']))
 yesno_list_row(_("Type:"), 'ProductionType', $_POST['ProductionType'],
        _("Produce Finished Items"), _("Return Items to Work Order"));
 
-text_row(_("Quantity:"), 'quantity', $_POST['quantity'], 13, 15);
+small_qty_row(_("Quantity:"), 'quantity', null, null, null, get_qty_dec($wo_details["stock_id"]));
 
 date_row(_("Date:"), 'date_');
 
@@ -160,8 +171,8 @@ textarea_row(_("Memo:"), 'memo_', null, 40, 3);
 
 end_table(1);
 
-submit_center_first('Process', _("Process"));
-submit_center_last('ProcessAndClose', _("Process And Close Order"));
+submit_center_first('Process', _("Process"), '', true);
+submit_center_last('ProcessAndClose', _("Process And Close Order"), '', true);
 
 end_form();