X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=d6fdce42646bec2abb3d9ea58f7aae8487eacbfa;hb=443214a800fa66cd1473b48f6fadd1b09144a5d4;hp=61388dd19469babef0f4aa7049254124e7414d53;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 61388dd1..d6fdce42 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -19,15 +19,26 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
-page(_($help_context = "Inventory Item Movement"), false, false, "", $js);
+if (isset($_GET['FixedAsset'])) {
+	$page_security = 'SA_ASSETSTRANSVIEW';
+	$_POST['fixed_asset'] = 1;
+	$_SESSION['page_title'] = _($help_context = "Fixed Assets Movement");
+} else {
+	$_SESSION['page_title'] = _($help_context = "Inventory Item Movement");
+}
+
+page($_SESSION['page_title'], isset($_GET['stock_id']), false, "", $js);
 //------------------------------------------------------------------------------------------------
 
-check_db_has_stock_items(_("There are no items defined in the system."));
+if (get_post('fixed_asset') == 1)
+	check_db_has_fixed_assets(_("There are no fixed asset defined in the system."));
+else
+	check_db_has_stock_items(_("There are no items defined in the system."));
 
 if(get_post('ShowMoves'))
 {
@@ -41,19 +52,41 @@ if (isset($_GET['stock_id']))
 
 start_form();
 
+hidden('fixed_asset');
+
 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)
+{
+	if (get_post('fixed_asset') == 1) {
+		stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id'],
+			false, false, check_value('show_inactive'), false, array('fixed_asset' => true));
+		check_cells(_("Show inactive:"), 'show_inactive', null, true);
+
+		if (get_post('_show_inactive_update')) {
+			$Ajax->activate('stock_id');
+			set_focus('stock_id');
+		}
+	} else
+		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);
+locations_list_cells(_("From Location:"), 'StockLocation', null, true, false, (get_post('fixed_asset') == 1));
 
-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');
+end_row();
 end_table();
 end_form();
 
@@ -61,39 +94,29 @@ set_global_stock_item($_POST['stock_id']);
 
 $before_date = date2sql($_POST['BeforeDate']);
 $after_date = date2sql($_POST['AfterDate']);
+$display_location = !$_POST['StockLocation'];
 
-$sql = "SELECT type, trans_no, tran_date, person_id, qty, reference
-	FROM ".TB_PREF."stock_moves
-	WHERE loc_code=".db_escape($_POST['StockLocation'])."
-	AND tran_date >= '". $after_date . "'
-	AND tran_date <= '" . $before_date . "'
-	AND stock_id = ".db_escape($_POST['stock_id']) . " ORDER BY tran_date,trans_id";
-$result = db_query($sql, "could not query stock moves");
-
-check_db_error("The stock movements for the selected criteria could not be retrieved",$sql);
+$result = get_stock_movements($_POST['stock_id'], $_POST['StockLocation'],
+	$_POST['BeforeDate'], $_POST['AfterDate']);
 
 div_start('doc_tbl');
-start_table($table_style);
-$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
-	_("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
+start_table(TABLESTYLE);
+$th = array(_("Type"), _("#"), _("Reference"));
 
-table_header($th);
+if ($display_location)
+	array_push($th, _("Location"));
+
+array_push($th, _("Date"), _("Detail"), _("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
 
-$sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves WHERE stock_id=".db_escape($_POST['stock_id']) . "
-	AND loc_code=".db_escape( $_POST['StockLocation']) . "
-	AND tran_date < '" . $after_date . "'";
-$before_qty = db_query($sql, "The starting quantity on hand could not be calculated");
+table_header($th);
 
-$before_qty_row = db_fetch_row($before_qty);
-$after_qty = $before_qty = $before_qty_row[0];
+$before_qty = get_qoh_on_date($_POST['stock_id'], $_POST['StockLocation'], add_days($_POST['AfterDate'], -1));
 
-if (!isset($before_qty_row[0]))
-{
-	$after_qty = $before_qty = 0;
-}
+$after_qty = $before_qty;
 
 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);
@@ -112,7 +135,10 @@ while ($myrow = db_fetch($result))
 
 	$trandate = sql2date($myrow["tran_date"]);
 
-	$type_name = $systypes_array[$myrow["type"]];
+	if (get_post('fixed_asset') == 1 && isset($fa_systypes_array[$myrow["type"]]))
+		$type_name = $fa_systypes_array[$myrow["type"]];
+	else
+		$type_name = $systypes_array[$myrow["type"]];
 
 	if ($myrow["qty"] > 0)
 	{
@@ -128,63 +154,34 @@ while ($myrow = db_fetch($result))
 
 	label_cell($type_name);
 
-	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
+	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]), "nowrap align='right'");
 
 	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"], $myrow["reference"]));
-	label_cell($trandate);
-
-	$person = $myrow["person_id"];
-	$gl_posting = "";
-
-	if (($myrow["type"] == ST_CUSTDELIVERY) || ($myrow["type"] == ST_CUSTCREDIT))
-	{
-		$cust_row = get_customer_details_from_trans($myrow["type"], $myrow["trans_no"]);
-
-		if (strlen($cust_row['name']) > 0)
-			$person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")";
 
+	if($display_location) {
+		label_cell($myrow['loc_code']);
 	}
-	elseif ($myrow["type"] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
-	{
-		// get the supplier name
-		$sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'";
-		$supp_result = db_query($sql,"check failed");
-
-		$supp_row = db_fetch($supp_result);
+	label_cell($trandate);
 
-		if (strlen($supp_row['supp_name']) > 0)
-			$person = $supp_row['supp_name'];
-	}
-	elseif ($myrow["type"] == ST_LOCTRANSFER || $myrow["type"] == ST_INVADJUST)
-	{
-		// get the adjustment type
-		$movement_type = get_movement_type($myrow["person_id"]);
-		$person = $movement_type["name"];
-	}
-	elseif ($myrow["type"]==ST_WORKORDER || $myrow["type"] == ST_MANUISSUE  ||
-		$myrow["type"] == ST_MANURECEIVE)
-	{
-		$person = "";
-	}
+	$gl_posting = "";
 
-	label_cell($person);
+	label_cell($myrow['name']);
 
 	label_cell((($myrow["qty"] >= 0) ? $quantity_formatted : ""), "nowrap align=right");
 	label_cell((($myrow["qty"] < 0) ? $quantity_formatted : ""), "nowrap align=right");
 	qty_cell($after_qty, false, $dec);
 	end_row();
+
 	$j++;
-	If ($j == 12)
+	if ($j == 12)
 	{
 		$j = 1;
 		table_header($th);
 	}
-//end of page full new headings if
 }
-//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);
@@ -194,4 +191,3 @@ end_table(1);
 div_end();
 end_page();
 
-?>