X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep451.php;h=88a1a69b41d5ec4ddab3160de516e2bdd923d7b5;hb=efa2530a7c385a329c3fc76f4560b28ba97c3efe;hp=d02db0448daa77c2fbb00b33be90f938f72e9e6d;hpb=f0e1edfccbf3608463c9da99b40f9c65fd298bb3;p=fa-stable.git

diff --git a/reporting/rep451.php b/reporting/rep451.php
index d02db044..88a1a69b 100644
--- a/reporting/rep451.php
+++ b/reporting/rep451.php
@@ -24,6 +24,17 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 include_once($path_to_root . "/fixed_assets/includes/fixed_assets_db.inc");
+include_once($path_to_root . "/fixed_assets/includes/fa_classes_db.inc");
+
+function find_last_location($stock_id, $end_date)
+{
+	$end_date = date2sql($end_date);
+	$sql = "SELECT loc_code FROM ".TB_PREF."stock_moves WHERE stock_id = ".db_escape($stock_id)." AND
+		tran_date <= '$end_date' ORDER BY tran_date DESC LIMIT 1";
+	$res = db_query($sql,"No stock moves were returned");
+	$row = db_fetch_row($res);
+	return $row[0];
+}
 
 //----------------------------------------------------------------------------------------------------
 
@@ -36,7 +47,7 @@ function print_fixed_assets_valuation_report()
     global $path_to_root, $SysPrefs;
 
 	$date = $_POST['PARAM_0'];
-    $category = $_POST['PARAM_1'];
+    $class = $_POST['PARAM_1'];
     $location = $_POST['PARAM_2'];
     $detail = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
@@ -50,12 +61,12 @@ function print_fixed_assets_valuation_report()
     $dec = user_price_dec();
 
 	$orientation = ($orientation ? 'L' : 'P');
-	if ($category == ALL_NUMERIC)
-		$category = 0;
-	if ($category == 0)
-		$cat = _('All');
+	if ($class == ALL_NUMERIC)
+		$class = 0;
+	if ($class== 0)
+		$cln = _('All');
 	else
-		$cat = get_category_name($category);
+		$cln = get_fixed_asset_classname($class);
 
 	if ($location == ALL_TEXT)
 		$location = 'all';
@@ -72,7 +83,7 @@ function print_fixed_assets_valuation_report()
 
     $params =   array( 	0 => $comments,
     					1 => array('text' => _('End Date'), 'from' => $date, 		'to' => ''),
-    				    2 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
+    				    2 => array('text' => _('Class'), 'from' => $cln, 'to' => ''),
     				    3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
     $rep = new FrontReport(_('Fixed Assets Valuation Report'), "FixedAssetsValReport", user_pagesize(), 9, $orientation);
@@ -90,6 +101,15 @@ function print_fixed_assets_valuation_report()
 	$catt = '';
 	while ($trans=db_fetch($res))
 	{
+		$loc = find_last_location($trans['stock_id'], $date);
+		if ($location != 'all' && $location != $loc)
+			continue;
+		$purchase = get_fixed_asset_purchase($trans['stock_id']);
+		$d = sql2date($purchase['tran_date']);
+		if (date1_greater_date2($d, $date))
+			continue;
+		if ($class != 0 && $cln != $trans['description'])
+			continue;
 		if ($catt != $trans['description'])
 		{
 			if ($catt != '')
@@ -114,7 +134,7 @@ function print_fixed_assets_valuation_report()
 				$rep->NewLine();
 		}
 		$UnitCost = $trans['purchase_cost'];
-		$Depreciation = $trans['purchase_cost'] - $trans['material_cost'];;
+		$Depreciation = $trans['purchase_cost'] - $trans['material_cost'];
 		$Balance = $trans['material_cost'];
 		if ($detail)
 		{