0000272: Manufacturing Bugs. Issue GL items moved to wo_work_order_issues.inc

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

diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php
index 1d994381aa44eb6d2a07679658d2c4dce1be3c8c..dc2a4380737d304d4c1062768f13907ad6ffe31c 100644 (file)
--- a/manufacturing/work_order_issue.php
+++ b/manufacturing/work_order_issue.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="..";
+$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");
@@ -26,16 +26,21 @@ if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Issue Items to Work Order"), false, false, "", $js);
+page(_($help_context = "Issue Items to Work Order"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
 {
-       echo "<center>" . _("The work order issue has been entered.");
-       echo "<br>";
+       $id = $_GET['AddedID'];
+       display_notification(_("The work order issue has been entered."));
+
+    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"));
-       echo "<br><br>";
+
        display_footer_exit();
 }
 //--------------------------------------------------------------------------------------------------
@@ -67,6 +72,8 @@ function handle_new_order()
 
 function can_process()
 {
+       global $Refs;
+
        if (!is_date($_POST['date_'])) 
        {
                display_error(_("The entered date for the issue is invalid."));
@@ -79,7 +86,7 @@ function can_process()
                set_focus('date_');
                return false;
        }
-       if (!references::is_valid($_POST['ref'])) 
+       if (!$Refs->is_valid($_POST['ref'])) 
        {
                display_error(_("You must enter a reference."));
                set_focus('ref');
@@ -94,7 +101,7 @@ function can_process()
        }
 
        $failed_item = $_SESSION['issue_items']->check_qoh($_POST['Location'], $_POST['date_'], !$_POST['IssueType']);
-       if ($failed_item >= 0) 
+       if ($failed_item != -1) 
        {
        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);
@@ -120,7 +127,7 @@ if (isset($_POST['Process']) && can_process())
        } 
        else 
        {
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=1");
+               meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_SESSION['issue_items']->order_id);
        }
 
 } /*end of process credit note */
@@ -207,7 +214,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();
@@ -215,7 +222,7 @@ echo "</td></tr>";
 
 end_table();
 
-submit_center('Process', _("Process Issue"), true, '', true);
+submit_center('Process', _("Process Issue"), true, '', 'default');
 
 end_form();