X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=d6fdce42646bec2abb3d9ea58f7aae8487eacbfa;hb=13fae1ba1d78cff66e326a006be2f538dd404248;hp=363f4dc9b8d402ce65d864009ed56d57febfb12d;hpb=e9ad9e87f5eb2682d2e91c93134250fd8a8d2ad9;p=fa-stable.git

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 363f4dc9..d6fdce42 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -23,10 +23,22 @@ 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);
+
+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'))
 {
@@ -38,8 +50,9 @@ if (isset($_GET['stock_id']))
 	$_POST['stock_id'] = $_GET['stock_id'];
 }
 
-if (!@$_GET['popup'])
-	start_form();
+start_form();
+
+hidden('fixed_asset');
 
 if (!isset($_POST['stock_id']))
 	$_POST['stock_id'] = get_global_stock_item();
@@ -47,14 +60,27 @@ if (!isset($_POST['stock_id']))
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 if (!$page_nested)
-	stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+{
+	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();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
-locations_list_cells(_("From Location:"), 'StockLocation', null, true);
+locations_list_cells(_("From Location:"), 'StockLocation', null, true, false, (get_post('fixed_asset') == 1));
 
 date_cells(_("From:"), 'AfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'BeforeDate');
@@ -62,8 +88,7 @@ date_cells(_("To:"), 'BeforeDate');
 submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
 end_row();
 end_table();
-if (!@$_GET['popup'])
-	end_form();
+end_form();
 
 set_global_stock_item($_POST['stock_id']);
 
@@ -110,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)
 	{
@@ -126,7 +154,7 @@ 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"]));