From: Mark Wells Date: Fri, 28 Feb 2014 20:48:12 +0000 (-0800) Subject: unbreak non-usage fees after #27687 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=4757eb16173dcc09d37b2f3856c0b7aba0e4652f;p=freeside.git unbreak non-usage fees after #27687 --- diff --git a/FS/FS/part_fee.pm b/FS/FS/part_fee.pm index fe6325040..2f48bfe16 100644 --- a/FS/FS/part_fee.pm +++ b/FS/FS/part_fee.pm @@ -269,6 +269,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 @@ -279,6 +281,8 @@ sub lineitem { $total_base = $cust_bill->charged; @item_base = map { $_->setup + $_->recur } @items; + + $amount += $total_base * $self->percent / 100; } }