X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=fixed_assets%2Finquiry%2Fstock_inquiry.php;h=c456d792823c86c248a316db7eaf6540d2095785;hb=ac6f8bdfc4a5a75aadbe6d63d2e451069fdcf6c9;hp=e60d448fb36d21330731fd6480df9d48eb3f1219;hpb=d4bcee971cf7ea37e2afc9d6abeb16d00af20de8;p=fa-stable.git

diff --git a/fixed_assets/inquiry/stock_inquiry.php b/fixed_assets/inquiry/stock_inquiry.php
index e60d448f..c456d792 100644
--- a/fixed_assets/inquiry/stock_inquiry.php
+++ b/fixed_assets/inquiry/stock_inquiry.php
@@ -73,11 +73,14 @@ function depr_method_title($row) {
   return $depreciation_methods[$row['depreciation_method']];
 }
 
-function depr_rate_title($row) {
-  if ($row['depreciation_method'] == 'S')
-    return $row['depreciation_rate'].' years';
-  else
-    return $row['depreciation_rate'].'%';
+function depr_par($row) {
+	if ($row['depreciation_method'] == 'D')
+		return $row['depreciation_rate']*$row['depreciation_factor'].'%';
+	elseif ($row['depreciation_method'] == 'N')
+		return $row['depreciation_rate'].' '._('years'
+		);
+	else
+		return $row['depreciation_rate'].'%';
 }
 
 function status_title($row) {
@@ -114,12 +117,12 @@ function disposal_link($row)
 
 function amount_link($row)
 {
-    return price_format($row['last_cost']);
+    return price_format($row['purchase_cost']);
 }
 
 function depr_link($row)
 {
-    return price_format($row['last_cost'] - $row['material_cost']);
+    return price_format($row['purchase_cost'] - $row['material_cost']);
 }
 
 function balance_link($row)
@@ -139,13 +142,13 @@ $cols = array(
 			_("Class"), 
 			_("UOM") => array('align' => 'center'), 
 			_("Description"),
-			_("Rate or Lifecycle") => array('fun' => 'depr_rate_title'), 
+			_("Rate or Lifecycle") => array('fun' => 'depr_par'), 
 			_("Method") => array('fun' => 'depr_method_title'), 
 			_("Status") => array('fun' => 'status_title'), 
 			_("Purchased") => array('fun' => 'purchase_link'),
-			_("Amount") => array('align'=>'right', 'fun' => 'amount_link'),
+			_("Initial") => array('align'=>'right', 'fun' => 'amount_link'),
 			_("Depreciations") => array('align'=>'right', 'fun' => 'depr_link'),
-			_("Balance") => array('align'=>'right', 'fun' => 'balance_link'),
+			_("Current") => array('align'=>'right', 'fun' => 'balance_link'),
 			_("Liquidation or Sale") => array('align' => 'center', 'fun' => 'disposal_link'), 
 			//array('insert'=>true, 'fun'=>'gl_view'),
 			//array('insert'=>true, 'fun'=>'rm_link'),