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 e8f6a25778af0558c6660fc9003374e7f62e0b0f..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"), false, 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."));
@@ -44,18 +43,26 @@ start_form();
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+if (!$page_nested)
+       stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+end_row();
+end_table();
 
-stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+start_table(TABLESTYLE_NOBORDER);
+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']);
 
@@ -66,7 +73,7 @@ $result = get_stock_movements($_POST['stock_id'], $_POST['StockLocation'],
        $_POST['BeforeDate'], $_POST['AfterDate']);
 
 div_start('doc_tbl');
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
        _("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));