diff options
author | Christopher Burger <burgerc@freeside.biz> | 2018-05-15 09:52:08 -0400 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2018-05-15 09:52:08 -0400 |
commit | 1ef463d50def1a8af49a8687ae4fc53f40311ab4 (patch) | |
tree | fe7e9c6b5d4e63ad1fe19a4996fa459a251bd04a /FS/FS/cust_main/Billing.pm | |
parent | 780141c7e972a8b55212515049bf3d51ef590466 (diff) |
Revert "RT# 77964 - Placed waive setup fee check back to billing.pm, and added check for prorate package in billing.pm"
This reverts commit d263897b2b9247340901f93c57f44c7f85d87d37.
Diffstat (limited to 'FS/FS/cust_main/Billing.pm')
-rw-r--r-- | FS/FS/cust_main/Billing.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index a5a38fd..44a4dbb 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1027,10 +1027,9 @@ sub _make_lines { || $cust_pkg->expire > $cmp_time ) ) { - + warn " bill setup\n" if $DEBUG > 1; - unless ($cust_pkg->waive_setup) { $lineitems++; $setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) }; @@ -1050,12 +1049,6 @@ sub _make_lines { $setup_billed_currency = delete $setup_param{'billed_currency'}; $setup_billed_amount = delete $setup_param{'billed_amount'}; } - } - - if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") { - $lineitems++; - $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time); - } if ( $cust_pkg->get('setup') ) { # don't change it |