Inventory Transfer: removed movement type from transfer form, cleanups.

[fa-stable.git] / inventory / reorder_level.php

diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index bd517f251221a18e5a762835ad5c2177c36bc665..8eca2ef19a629c473162ed111f43569d3da2bc97 100644 (file)
--- a/inventory/reorder_level.php
+++ b/inventory/reorder_level.php
@@ -21,8 +21,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
-if (!@$_GET['popup'])
-       page(_($help_context = "Reorder Levels"));
+page(_($help_context = "Reorder Levels"));
 
 check_db_has_costable_items(_("There are no inventory items defined in the system (Purchased or manufactured items)."));
 
@@ -37,13 +36,16 @@ if (list_updated('stock_id'))
        $Ajax->activate('reorders');
 }
 //------------------------------------------------------------------------------------
-if (!@$_GET['popup'])
-       start_form();
+
+$action = $_SERVER['PHP_SELF'];
+if ($page_nested)
+       $action .= "?stock_id=".get_post('stock_id');
+start_form(false, false, $action);
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
-if (!@$_GET['popup'])
+if (!$page_nested)
 {
        echo "<center>" . _("Item:"). "&nbsp;";
        echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
@@ -60,7 +62,7 @@ div_end();
 set_global_stock_item($_POST['stock_id']);
 
 div_start('reorders');
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Location"), _("Quantity On Hand"), _("Re-Order Level"));
 table_header($th);
@@ -70,9 +72,8 @@ $k=0; //row colour counter
 
 $result = get_loc_details($_POST['stock_id']);
 
-if (@$_GET['popup'])
+if ($page_nested)
 {
-       hidden('_tabs_sel', get_post('_tabs_sel'));
        hidden('popup', @$_GET['popup']);
 }
 
@@ -110,9 +111,5 @@ end_table(1);
 div_end();
 submit_center('UpdateData', _("Update"), true, false, 'default');
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page(@$_GET['popup'], false, false);
-}
-?>
+end_form();
+end_page();