Merged latest changes from stable branch.

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

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 86ba926484a6cd9b95928185abe27d77d5ccbe02..30e73c0c7066477744e630e5d08b742880c04f79 100644 (file)
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -84,8 +84,10 @@ if (list_updated('stock_id'))
        $Ajax->activate('cost_table');
 //-----------------------------------------------------------------------------------------
 
-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();
@@ -135,9 +137,6 @@ end_table(1);
 div_end();
 submit_center('UpdateData', _("Update"), true, false, 'default');
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page(@$_GET['popup'], false, false);
-}
+end_form();
+end_page();
 ?>