Cleanups in price/cost/reorder levels pages.

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 30e73c0c7066477744e630e5d08b742880c04f79..7f314facc5d2797e3f80a5efa8ad9d7ea653cc79 100644 (file)
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -23,13 +23,10 @@ include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
-if (!@$_GET['popup'])
-{
-       $js = "";
-       if ($use_popup_windows)
-               $js .= get_js_open_window(900, 500);
-       page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
-}
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------------
 
@@ -85,14 +82,14 @@ if (list_updated('stock_id'))
 //-----------------------------------------------------------------------------------------
 
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+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);
@@ -117,9 +114,8 @@ $_POST['overhead_cost'] = price_decimal_format($myrow["overhead_cost"], $dec3);
 
 amount_row(_("Standard Material Cost Per Unit"), "material_cost", null, "class='tableheader2'", null, $dec1);
 
-if (@$_GET['popup'])
+if ($page_nested)
 {
-       hidden('_tabs_sel', get_post('_tabs_sel'));
        hidden('popup', @$_GET['popup']);
 }
 if ($myrow["mb_flag"]=='M')

diff --git a/inventory/prices.php b/inventory/prices.php
index 84db8288d1b8cbc8e9471df73d80547655cb9dc6..2851ecd82b6a321d905d43caea6278103ffc10e8 100644 (file)
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -22,8 +22,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 = "Inventory Item Sales prices"));
+page(_($help_context = "Inventory Item Sales prices"));
 
 //---------------------------------------------------------------------------------------------------
 
@@ -51,14 +50,14 @@ if (!isset($_POST['curr_abrev']))
 
 //---------------------------------------------------------------------------------------------------
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+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 sales_items_list('stock_id', $_POST['stock_id'], false, true, '', array('editable' => false));
@@ -183,9 +182,8 @@ if ($Mode == 'Edit')
 }
 
 hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
+if ($page_nested)
 {
-       hidden('_tabs_sel', get_post('_tabs_sel'));
        hidden('popup', @$_GET['popup']);
 }
 div_start('price_details');

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 286ad1350718de574ae1ee8f67eb750bf45e7915..4b7717d546cc90d89a3d1e2219b6ee8f3bbb8376 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -21,8 +21,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
-if (!@$_GET['popup'])
-       page(_($help_context = "Supplier Purchasing Data"));
+page(_($help_context = "Supplier Purchasing Data"));
 
 check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@ -107,14 +106,14 @@ if (list_updated('stock_id'))
 //--------------------------------------------------------------------------------------------------
 
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+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;";
        //Chaitanya : All items can be purchased
@@ -196,9 +195,8 @@ if ($Mode =='Edit')
 
 br();
 hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
+if ($page_nested)
 {
-       hidden('_tabs_sel', get_post('_tabs_sel'));
        hidden('popup', @$_GET['popup']);
 }
 

diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index 7a37b8f5e751012ecc1ab2fa02c553b1af10aec0..f071b5225d49db8ae1552e229629667f30ba12c5 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)."));
 
@@ -39,14 +38,14 @@ if (list_updated('stock_id'))
 //------------------------------------------------------------------------------------
 
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+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);
@@ -73,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']);
 }