From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 7 Dec 2015 23:35:00 +0000 (+0100)
Subject: Fixed Assets, a couple of small bugs more.
X-Git-Tag: v2.4.2~19^2~112
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=67db08b7be01468ed2338f195bb13d1583e7ce47;p=fa-stable.git

Fixed Assets, a couple of small bugs more.
---

diff --git a/fixed_assets/includes/fa_classes_db.inc b/fixed_assets/includes/fa_classes_db.inc
index 6f76c48b..919f053b 100644
--- a/fixed_assets/includes/fa_classes_db.inc
+++ b/fixed_assets/includes/fa_classes_db.inc
@@ -19,6 +19,17 @@ function get_fixed_asset_classes()
 	return $result;
 }
 
+function get_fixed_asset_classname($class)
+{
+	$sql="SELECT description FROM ".TB_PREF."stock_fa_class WHERE fa_class_id = ".db_escape($class);;
+
+	$result = db_query($sql,"fixed asset class name could not be retrieved");
+
+	$row = db_fetch_row($result);
+	
+	return $row[0];
+}
+
 function update_fixed_asset_class($fa_class_id, $parent_id, $description, $long_description, $depreciation_rate)
 {
 	$sql = "UPDATE ".TB_PREF."stock_fa_class SET
diff --git a/reporting/rep451.php b/reporting/rep451.php
index d02db044..da0f06d4 100644
--- a/reporting/rep451.php
+++ b/reporting/rep451.php
@@ -24,6 +24,7 @@ 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");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -36,7 +37,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 +51,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 +73,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 +91,11 @@ function print_fixed_assets_valuation_report()
 	$catt = '';
 	while ($trans=db_fetch($res))
 	{
+		$d = sql2date($trans['purchase_date']);
+		if (date1_greater_date2($d, $date))
+			continue;
+		if ($class != 0 && $cln != $trans['description'])
+			continue;
 		if ($catt != $trans['description'])
 		{
 			if ($catt != '')