X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=676540f7e753ce15bcc12b1b1f579d2018b3059c;hb=b6ae2ddcd0cbc571edd01157ca1c8d44bbe071ef;hp=3f85c0376f522bec9e744933eced092c58ed81c0;hpb=5d3fcb9c57e586c20651594edf91a2dccb08df00;p=fa-stable.git

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 3f85c037..676540f7 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -18,11 +18,9 @@ else
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 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 +105,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
@@ -144,7 +142,7 @@ else
     }
     else
     {
-        start_table(TABLESTYLE, "width=65%");
+        start_table(TABLESTYLE, "width='65%'");
 
 		$th = array(_("Supplier"), _("Price"), _("Currency"),
 			_("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
@@ -196,8 +194,10 @@ if ($Mode =='Edit')
 
 br();
 hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
-	hidden('_tabs_sel', get_post('_tabs_sel'));
+if ($page_nested)
+{
+	hidden('popup', @$_GET['popup']);
+}
 
 start_table(TABLESTYLE2);
 
@@ -227,7 +227,4 @@ end_table(1);
 submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
-if (!@$_GET['popup'])
-	end_page(@$_GET['popup'], false, false);
-
-?>
+end_page();