[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php
index 1b129f35055ac5fdb48c290f70d669a375feb050..025a91258c2dcfb7f76c398c90927b23c7ea9951 100644 (file)
--- a/manufacturing/work_order_issue.php
+++ b/manufacturing/work_order_issue.php
@@ -11,6 +11,7 @@
 ***********************************************************************/
 $page_security = 'SA_MANUFISSUE';
 $path_to_root = "..";
+
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -22,19 +23,23 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc");
 include_once($path_to_root . "/manufacturing/includes/work_order_issue_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
+
 page(_($help_context = "Issue Items to Work Order"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
 {
+       $id = $_GET['AddedID'];
        display_notification(_("The work order issue has been entered."));
 
-    display_note(get_trans_view_str(ST_WORKORDER, $_GET['AddedID'], _("View this Work Order")));
+    display_note(get_trans_view_str(ST_WORKORDER, $id, _("View this Work Order")));
+
+       display_note(get_gl_view_str(ST_WORKORDER, $id, _("View the GL Journal Entries for this Work Order")), 1);
 
        hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process"));
 
@@ -59,49 +64,35 @@ function handle_new_order()
                unset ($_SESSION['issue_items']);
        }
 
-     Session_register("issue_items");
-
-     $_SESSION['issue_items'] = new items_cart(28);
+     $_SESSION['issue_items'] = new items_cart(ST_MANUISSUE);
      $_SESSION['issue_items']->order_id = $_GET['trans_no'];
 }
 
 //-----------------------------------------------------------------------------------------------
-
 function can_process()
 {
-       global $Refs;
-
-       if (!is_date($_POST['date_'])) 
+       if (!is_date($_POST['date_']))
        {
                display_error(_("The entered date for the issue 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."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('date_');
                return false;
        }
-       if (!$Refs->is_valid($_POST['ref'])) 
-       {
-               display_error(_("You must enter a reference."));
-               set_focus('ref');
-               return false;
-       }
-
-       if (!is_new_reference($_POST['ref'], 28)) 
+       if (!check_reference($_POST['ref'], ST_MANUISSUE))
        {
-               display_error(_("The entered reference is already in use."));
                set_focus('ref');
                return false;
        }
 
        $failed_item = $_SESSION['issue_items']->check_qoh($_POST['Location'], $_POST['date_'], !$_POST['IssueType']);
-       if ($failed_item != -1) 
+       if ($failed_item)
        {
-       display_error( _("The issue cannot be processed because an entered item would cause a negative inventory balance :") .
-               " " . $failed_item->stock_id . " - " .  $failed_item->item_description);
+               display_error(_("The issue cannot be processed because it would cause negative inventory balance for marked items as of document date or later."));
                return false;
        }
 
@@ -133,7 +124,7 @@ if (isset($_POST['Process']) && can_process())
 
 function check_item_data()
 {
-       if (!check_num('qty', 0))
+       if (input_num('qty') == 0 || !check_num('qty', 0))
        {
                display_error(_("The quantity entered is negative or invalid."));
                set_focus('qty');
@@ -211,7 +202,7 @@ echo "<br>";
 
 start_form();
 
-start_table("$table_style width=90%", 10);
+start_table(TABLESTYLE, "width='90%'", 10);
 echo "<tr><td>";
 display_issue_items(_("Items to Issue"), $_SESSION['issue_items']);
 issue_options_controls();
@@ -227,4 +218,3 @@ end_form();
 
 end_page();
 
-?>