Minor adjustments

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 47bc92f08902d1b4f5115bc37d9a38df24f8cfec..51a5115c1519f0e482c7d26accd9b35301412883 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+25-Jul-2008 Joe Hunt
+# Minor adjustments
+$ /includes/page/header.inc
+  /manufacturing/work_order_release.php
+  
 25-Jul-2008 Joe Hunt
 # Default application setting does not work [0000034]
 $ /includes/page/header.inc

diff --git a/includes/page/header.inc b/includes/page/header.inc
index 931616f1a7a38a07b1ef1c8298577af5e7d11f8f..97529207827b49f15a4b97c41126d9dec924d57b 100644 (file)
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -93,7 +93,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
                $sel_app = $_SESSION["sel_app"];
        else
                $sel_app = $def_app;
-       $_SESSION["App"]->selected_application = $_SESSION["sel_app"] = $sel_app;
+       $_SESSION["sel_app"] = $sel_app;
+       if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
+               $_SESSION["App"]->selected_application = $sel_app;
        $encoding = $_SESSION['language']->encoding;
 
        if (!headers_sent()){

diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php
index 02593137feff75c0a4e5125380a45587015c80e0..91db03bd9aa846b7b4897f69fa6d2d409d1a09d0 100644 (file)
--- a/manufacturing/work_order_release.php
+++ b/manufacturing/work_order_release.php
@@ -18,12 +18,12 @@ page(_("Work Order Release to Manufacturing"), false, false, "", $js);
 if (isset($_GET["trans_no"]))
 {
        $selected_id = $_GET["trans_no"];
-} 
+}
 elseif (isset($_POST["selected_id"]))
 {
        $selected_id = $_POST["selected_id"];
-} 
-else 
+}
+else
 {
        display_note("This page must be called with a work order reference");
        exit;
@@ -33,37 +33,36 @@ else
 
 function can_process($myrow)
 {
-       if ($myrow['released']) 
+       if ($myrow['released'])
        {
                display_error(_("This work order has already been released."));
                set_focus('released');
                return false;
        }
-       
+
        // make sure item has components
-       if (!has_bom($myrow['stock_id'])) 
+       if (!has_bom($myrow['stock_id']))
        {
                display_error(_("This Work Order cannot be released. The selected item to manufacture does not have a bom."));
                set_focus('stock_id');
                return false;
-       }               
-       
+       }
+
        return true;
 }
 
 //------------------------------------------------------------------------------------
-
-if (isset($_POST['release'])) 
+if (isset($_POST['release']))
 {
        release_work_order($selected_id, $_POST['released_date'], $_POST['memo_']);
-       
+
        display_note(_("The work order has been released to manufacturing."));
-       
+
        hyperlink_no_params("search_work_orders.php", _("Select another work order"));
 
-       end_page();     
-       
-       exit;  
+       end_page();
+
+       exit;
 }
 
 //------------------------------------------------------------------------------------
@@ -75,21 +74,21 @@ $myrow = get_work_order($selected_id);
 $_POST['released'] = $myrow["released"];
 $_POST['memo_'] = "";
 
-if (can_process($myrow)) 
+if (can_process($myrow))
 {
        start_table($table_style2);
-               
+
     label_row(_("Work Order #:"), $selected_id);
     label_row(_("Work Order Reference:"), $myrow["wo_ref"]);
-    
+
     date_row(_("Released Date") . ":", 'released_date');
-    
+
     textarea_row(_("Memo:"), 'memo_', $_POST['memo_'], 40, 5);
-    
+
     end_table(1);
-    
-    submit_center('release', _("Release Work Order"), true, '', true);
-    
+
+    submit_center('release', _("Release Work Order"), true, '', false);
+
     hidden('selected_id', $selected_id);
     hidden('stock_id', $myrow['stock_id']);