Cleanup after merge.

[fa-stable.git] / inventory / inquiry / stock_movements.php

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index aaee30cdf57dc9361368365a7934ae917ed0761b..a18f9a7936287835c00ba1630972f1fe7837d48f 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -23,8 +23,7 @@ if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-
-page(_($help_context = "Inventory Item Movement"), @$_REQUEST['popup'], false, "", $js);
+page(_($help_context = "Inventory Item Movement"), @$_GET['popup'], false, "", $js);
 //------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -46,7 +45,8 @@ if (!isset($_POST['stock_id']))
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
-stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+if (!$page_nested)
+       stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
 end_row();
 end_table();
 
@@ -55,13 +55,14 @@ start_row();
 
 locations_list_cells(_("From Location:"), 'StockLocation', null);
 
-date_cells(_("From:"), 'AfterDate', '', null, -30);
+date_cells(_("From:"), 'AfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 date_cells(_("To:"), 'BeforeDate');
 
 submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
 end_row();
 end_table();
-end_form();
+if (!@$_GET['popup'])
+       end_form();
 
 set_global_stock_item($_POST['stock_id']);
 
@@ -185,6 +186,6 @@ end_row();
 
 end_table(1);
 div_end();
-end_page(@$_REQUEST['popup'], false, false);
+end_page();
 
 ?>