diff options
author | Mark Wells <mark@freeside.biz> | 2016-09-20 13:16:58 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-09-20 13:16:58 -0700 |
commit | d283b110845ffc2034632f78c03d4b5cf5ab49f5 (patch) | |
tree | 6f3d6dd5e319a554eea73e1ca664da3966201ba9 /FS/FS | |
parent | 08de3ec51a1539162fe17e35a3cb04effd3dbcfb (diff) |
Revert "when crediting unused time on packages, also credit any tax that was charged, #42729"
This reverts commit 08de3ec51a1539162fe17e35a3cb04effd3dbcfb.
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/part_pkg/flat.pm | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index f23717b..84599ea 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -235,8 +235,6 @@ sub calc_remain { $time = time; } - my $sources = $options{'cust_credit_source_bill_pkg'}; - my $next_bill = $cust_pkg->getfield('bill') || 0; return 0 if ! $self->base_recur($cust_pkg, \$time) @@ -272,30 +270,17 @@ sub calc_remain { $amount = $amount * ($edate - $time) / ($edate - $cust_bill_pkg->sdate); } - # calculate tax adjustment. we're not doing full credit_lineitems here - # (e.g. not applying the credit to the past billing of this package) - # so just include the adjustment in the source record with the rest - # of the credit - my %tax_adjust = FS::cust_credit->calculate_tax_adjustment( - 'custnum' => $cust_pkg->custnum, - 'billpkgnums' => [ $cust_bill_pkg->billpkgnum ], - 'setuprecurs' => [ 'recur' ], - 'amounts' => [ $amount ], - ); - $amount += $tax_adjust{taxtotal}; - - $amount = sprintf('%.2f', $amount); # ensure that amounts add up right $credit += $amount; - if ( $sources ) { - push @$sources, - FS::cust_credit_source_bill_pkg->new( { - 'billpkgnum' => $cust_bill_pkg->billpkgnum, - 'amount' => $amount, - 'currency' => $cust_bill_pkg->cust_bill->currency, - } ); - } - } # foreach $cust_bill_pkg + push @{ $options{'cust_credit_source_bill_pkg'} }, + new FS::cust_credit_source_bill_pkg { + 'billpkgnum' => $cust_bill_pkg->billpkgnum, + 'amount' => sprintf('%.2f', $amount), + 'currency' => $cust_bill_pkg->cust_bill->currency, + } + if $options{'cust_credit_source_bill_pkg'}; + + } sprintf('%.2f', $credit); |