From: Mark Wells Date: Fri, 28 Feb 2014 20:25:57 +0000 (-0800) Subject: unbreak non-usage fees after #27687 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=e24da2a00485cfe81e34731ebebb6d69d4b0eab9 unbreak non-usage fees after #27687 --- diff --git a/FS/FS/part_fee.pm b/FS/FS/part_fee.pm index 186fb346e..ccf13513b 100644 --- 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; } }