Print Remittances: fixed usage of sys_prefs 'print_invoice_no' option.

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

diff --git a/inventory/prices.php b/inventory/prices.php
index 84db8288d1b8cbc8e9471df73d80547655cb9dc6..c537752ecb4222ff661d729e07238b3d26cd8e80 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));
@@ -143,7 +142,7 @@ if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) || isset($_P
 $prices_list = get_prices($_POST['stock_id']);
 
 div_start('price_table');
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Currency"), _("Sales Type"), _("Price"), "", "");
 table_header($th);
@@ -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');
@@ -212,4 +210,3 @@ div_end();
 
 end_form();
 end_page();
-?>