Merged latest changes from stable branch.

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

diff --git a/inventory/prices.php b/inventory/prices.php
index 66d3bee099482041a449b56a27ddec6f9c900918..84db8288d1b8cbc8e9471df73d80547655cb9dc6 100644 (file)
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -50,8 +50,10 @@ if (!isset($_POST['curr_abrev']))
 }
 
 //---------------------------------------------------------------------------------------------------
-if (!@$_GET['popup'])
-       start_form();
+$action = $_SERVER['PHP_SELF'];
+if (@$_GET['popup'])
+       $action .= "?stock_id=".get_post('stock_id');
+start_form(false, false, $action);
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
@@ -208,9 +210,6 @@ if ($calculated)
 submit_add_or_update_center($selected_id == -1, '', 'both');
 div_end();
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page(@$_GET['popup'], false, false);
-}      
+end_form();
+end_page();
 ?>