projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
beff2be
)
unbreak non-usage fees after #27687
author
Mark Wells
<mark@freeside.biz>
Fri, 28 Feb 2014 20:25:57 +0000
(12:25 -0800)
committer
Mark Wells
<mark@freeside.biz>
Fri, 28 Feb 2014 20:25:57 +0000
(12:25 -0800)
FS/FS/part_fee.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_fee.pm
b/FS/FS/part_fee.pm
index
186fb34
..
ccf1351
100644
(file)
--- a/
FS/FS/part_fee.pm
+++ b/
FS/FS/part_fee.pm
@@
-265,6
+265,8
@@
sub lineitem {
' FROM cust_bill_pkg WHERE billpkgnum = ?';
@item_base = map { FS::Record->scalar_sql($sql, $_->billpkgnum) }
@items;
+
+ $amount += $total_base * $self->percent / 100;
}
} else {
# the fee applies to _this_ invoice. It has no payments or credits, so
@@
-275,6
+277,8
@@
sub lineitem {
$total_base = $cust_bill->charged;
@item_base = map { $_->setup + $_->recur }
@items;
+
+ $amount += $total_base * $self->percent / 100;
}
}