X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=e7fb0eed31d893b157e62dd5d99ef286dc6a5140;hb=7561718ee5113232ce917f63085d272884b0929c;hp=2c5aa0e044b6c77a139190e9850f43a56288c590;hpb=575fa4304beb3cd570a0352d52ee6c6aeb3864f7;p=fa-stable.git

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 2c5aa0e0..e7fb0eed 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -18,15 +18,12 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 include_once($path_to_root . "/includes/ui.inc");
-if (!@$_GET['popup'])
-{
-	$js = "";
-	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"), @$_GET['popup'], false, "", $js);
-}	
+$js = "";
+if ($SysPrefs->use_popup_windows)
+	$js .= get_js_open_window(800, 500);
+if (user_use_date_picker())
+	$js .= get_js_date_picker();
+page(_($help_context = "Inventory Item Movement"), @$_GET['popup'], false, "", $js);
 //------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -41,15 +38,14 @@ if (isset($_GET['stock_id']))
 	$_POST['stock_id'] = $_GET['stock_id'];
 }
 
-if (!@$_GET['popup'])
-	start_form();
+start_form();
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
-if (!@$_GET['popup'])
+if (!$page_nested)
 	stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
 end_row();
 end_table();
@@ -57,9 +53,9 @@ end_table();
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-locations_list_cells(_("From Location:"), 'StockLocation', null);
+locations_list_cells(_("From Location:"), 'StockLocation', null, true);
 
-date_cells(_("From:"), 'AfterDate', '', null, -30);
+date_cells(_("From:"), 'AfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'BeforeDate');
 
 submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
@@ -72,14 +68,17 @@ set_global_stock_item($_POST['stock_id']);
 
 $before_date = date2sql($_POST['BeforeDate']);
 $after_date = date2sql($_POST['AfterDate']);
+$display_location = !$_POST['StockLocation'];
 
 $result = get_stock_movements($_POST['stock_id'], $_POST['StockLocation'],
 	$_POST['BeforeDate'], $_POST['AfterDate']);
 
 div_start('doc_tbl');
 start_table(TABLESTYLE);
-$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
-	_("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
+$th = array(_("Type"), _("#"), _("Reference"));
+if($display_location) array_push($th, _("Location"));
+array_push($th, _("Date"), _("Detail"), _("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
+
 
 table_header($th);
 
@@ -94,7 +93,8 @@ if (!isset($before_qty_row[0]))
 }
 */
 start_row("class='inquirybg'");
-label_cell("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=5");
+$header_span = $display_location ? 6 : 5;
+label_cell("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=$header_span");
 label_cell("&nbsp;", "colspan=2");
 $dec = get_qty_dec($_POST['stock_id']);
 qty_cell($before_qty, false, $dec);
@@ -132,6 +132,9 @@ while ($myrow = db_fetch($result))
 	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
 
 	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"], $myrow["reference"]));
+	if($display_location) {
+		label_cell($myrow['loc_code']);
+	}
 	label_cell($trandate);
 
 	$person = $myrow["person_id"];
@@ -182,7 +185,7 @@ while ($myrow = db_fetch($result))
 //end of while loop
 
 start_row("class='inquirybg'");
-label_cell("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "align=center colspan=5");
+label_cell("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "align=center colspan=$header_span");
 qty_cell($total_in, false, $dec);
 qty_cell($total_out, false, $dec);
 qty_cell($after_qty, false, $dec);
@@ -190,7 +193,5 @@ end_row();
 
 end_table(1);
 div_end();
-if (!@$_GET['popup'])
-	end_page(@$_GET['popup'], false, false);
+end_page();
 
-?>