diff options
| author | jeff <jeff> | 2009-10-05 01:07:45 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2009-10-05 01:07:45 +0000 |
| commit | 23c040e33756559d49cf9b66d9c19a3a9d29d9c0 (patch) | |
| tree | 190c58eb8149c7c8257f293e1c53275d006136ea /FS/FS/cust_main.pm | |
| parent | 3b53cfb49162c9a1f32027b67ba4cbe86d65d3e5 (diff) | |
don't consider setup or recurring taxes when billing usage on cancel
Diffstat (limited to 'FS/FS/cust_main.pm')
| -rw-r--r-- | FS/FS/cust_main.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 501fca4..d61ebd2 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -3036,7 +3036,7 @@ sub _make_lines { ### my $error = - $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time}, $real_pkgpart); + $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time}, $real_pkgpart, \%options); return $error if $error; push @$cust_bill_pkgs, $cust_bill_pkg; @@ -3057,6 +3057,7 @@ sub _handle_taxes { my $cust_pkg = shift; my $invoice_time = shift; my $real_pkgpart = shift; + my $options = shift; my %cust_bill_pkg = (); my %taxes = (); @@ -3064,8 +3065,8 @@ sub _handle_taxes { my @classes; #push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->type eq 'U'; push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->usage; - push @classes, 'setup' if $cust_bill_pkg->setup; - push @classes, 'recur' if $cust_bill_pkg->recur; + push @classes, 'setup' if ($cust_bill_pkg->setup && !$options->{cancel}); + push @classes, 'recur' if ($cust_bill_pkg->recur && !$options->{cancel}); if ( $self->tax !~ /Y/i && $self->payby ne 'COMP' ) { |