projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 5332: Rep709, Tax Report, Multiple entries for a sinle tax line. Fixed.
[fa-stable.git]
/
fixed_assets
/
includes
/
depreciation.inc
diff --git
a/fixed_assets/includes/depreciation.inc
b/fixed_assets/includes/depreciation.inc
index cc5390795c3f56b36b3d4f0ead0162bd496a8010..b63ad1a8eb527a5869db59a96d1d3864eefa9472 100644
(file)
--- a/
fixed_assets/includes/depreciation.inc
+++ b/
fixed_assets/includes/depreciation.inc
@@
-69,7
+69,9
@@
function compute_gl_rows_for_depreciation($item, $no_months, $period) {
$value = $line_value;
break;
$value = $line_value;
break;
- case 'S': // actual_cost stores start cost of item
+ 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;
$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++) {
$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;
$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++;
$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;
}
return $rows;
}