X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=fixed_assets%2Fincludes%2Fdepreciation.inc;h=b63ad1a8eb527a5869db59a96d1d3864eefa9472;hb=a0aa0951b112eb22726567ad545bcbc1ab28fb99;hp=3bc72126cebb53c1fa10003720d5eebb388f3f57;hpb=24d4232a93fcba194f526417627ebfdbf7589889;p=fa-stable.git

diff --git a/fixed_assets/includes/depreciation.inc b/fixed_assets/includes/depreciation.inc
index 3bc72126..b63ad1a8 100644
--- a/fixed_assets/includes/depreciation.inc
+++ b/fixed_assets/includes/depreciation.inc
@@ -70,6 +70,8 @@ function compute_gl_rows_for_depreciation($item, $no_months, $period) {
 		break;
 
     case 'S':	// purchase_cost stores start cost of item
+		$done_months = months_between_dates($item['depreciation_start'], $item['depreciation_date']);
+		$remaining_months = 12.0 * 100.0/$item['depreciation_rate'] - $done_months;
 		$value = $item['purchase_cost']*$item['depreciation_rate']/100/12;
 		break;
 
@@ -90,6 +92,12 @@ function compute_gl_rows_for_depreciation($item, $no_months, $period) {
   $total = 0;
   $cnt = 0;
   for ($i=$m; $i < $m + $no_months; $i++) {
+
+	if ($item['depreciation_method'] == 'S') {
+		if ($cnt >= $remaining_months)
+			$value = 0;
+	}
+
     $date = sql2date(date("$y-$i-t", strtotime("$y-$i-1")));
 
     $total += $value;
@@ -109,15 +117,11 @@ function compute_gl_rows_for_depreciation($item, $no_months, $period) {
 
     $cnt++;
 
-    if ($item['depreciation_method'] == 'S') {
-      if ($cnt >= $remaining_months)
-        $value = 0;
-    }
-    elseif ($item['depreciation_method'] == 'O') {
-      // depreciate only in the first month
-      $value = 0;
-    }
-  }
+	if ($item['depreciation_method'] == 'O') {
+		// depreciate only in the first month
+		$value = 0;
+	}
+ }
 
   return $rows;
 }