Merged latest changes from stable branch.

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

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index d0b1685d8f5e0acbb5134d660aa2468532dab29b..286ad1350718de574ae1ee8f67eb750bf45e7915 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -106,8 +106,10 @@ if (list_updated('stock_id'))
        $Ajax->activate('price_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();
@@ -227,9 +229,6 @@ end_table(1);
 
 submit_add_or_update_center($selected_id == -1, '', 'both');
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page(@$_GET['popup'], false, false);
-}
+end_form();
+end_page();
 ?>