diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-05-15 09:52:34 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-05-15 09:52:34 -0400 |
| commit | c0a48dabc8d0d2a66dc6a596a66c9d40c7d37489 (patch) | |
| tree | 0a949d679e32c608a6ec9541211d59fcf3fa8ebe /FS/FS/cust_main | |
| parent | 1ef463d50def1a8af49a8687ae4fc53f40311ab4 (diff) | |
Revert "RT# 77964 - fixed so deferring date now works when waive setup fee is set"
This reverts commit 9cdd008acdaa19127409188b51e25fe8c8b0b04b.
Diffstat (limited to 'FS/FS/cust_main')
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index 44a4dbb..08b10c1 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1030,6 +1030,7 @@ sub _make_lines { warn " bill setup\n" if $DEBUG > 1; + unless ( $cust_pkg->waive_setup ) { $lineitems++; $setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) }; @@ -1049,6 +1050,7 @@ sub _make_lines { $setup_billed_currency = delete $setup_param{'billed_currency'}; $setup_billed_amount = delete $setup_param{'billed_amount'}; } + } if ( $cust_pkg->get('setup') ) { # don't change it |