Fixed warnings related to empty item/customer/supplier selector in search modes.

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

diff --git a/inventory/prices.php b/inventory/prices.php
index 84db8288d1b8cbc8e9471df73d80547655cb9dc6..7132eb624c7fab66153285b2cb4e8c6fd38b9445 100644 (file)
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -10,10 +10,11 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_SALESPRICE';
-if (!@$_GET['popup'])
-       $path_to_root = "..";
-else   
+
+if (@$_GET['page_level'] == 1)
        $path_to_root = "../..";
+else   
+       $path_to_root = "..";
 
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
@@ -22,8 +23,10 @@ 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"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+       $js .= get_js_open_window(900, 500);
+page(_($help_context = "Inventory Item Sales prices"), false, false, "", $js);
 
 //---------------------------------------------------------------------------------------------------
 
@@ -51,14 +54,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 +146,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,11 +186,7 @@ if ($Mode == 'Edit')
 }
 
 hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
-{
-       hidden('_tabs_sel', get_post('_tabs_sel'));
-       hidden('popup', @$_GET['popup']);
-}
+
 div_start('price_details');
 start_table(TABLESTYLE2);
 
@@ -201,7 +200,8 @@ if (!isset($_POST['price'])) {
 }
 
 $kit = get_item_code_dflts($_POST['stock_id']);
-small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$kit["units"]);
+$units = $kit ? $kit["units"] : '';
+small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$units);
 
 end_table(1);
 if ($calculated)
@@ -212,4 +212,3 @@ div_end();
 
 end_form();
 end_page();
-?>