X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=523a810d4f28daf55c43c2a95d1489834cab8461;hb=ac07dfa491181046e8dd2881d6093da9e8d3616f;hp=10a007c57899c50b4cbda2be07c2c69f8b160e03;hpb=55460bc6ec42a52fd650498d37dfbb3af0bf413d;p=freeside.git diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm index 10a007c57..523a810d4 100644 --- a/FS/FS/cust_main_county.pm +++ b/FS/FS/cust_main_county.pm @@ -241,9 +241,6 @@ will in turn have a "taxable_cust_bill_pkg" pseudo-field linking it to one of the taxable items. All of these links must be resolved as the objects are inserted. -In addition to calculating the tax for the line items, this will calculate -any appropriate tax exemptions and attach them to the line items. - Options may include 'custnum' and 'invoice_time' in case the cust_bill_pkg objects belong to an invoice that hasn't been inserted yet. @@ -257,6 +254,10 @@ tax exemption limit if there is one. sub taxline { my( $self, $taxables, %opt ) = @_; + $taxables = [ $taxables ] unless ref($taxables) eq 'ARRAY'; + # remove any charge class identifiers; they're not supported here + @$taxables = grep { ref $_ } @$taxables; + return 'taxline called with no line items' unless @$taxables; local $SIG{HUP} = 'IGNORE'; @@ -278,24 +279,11 @@ sub taxline { my $custnum = $cust_bill ? $cust_bill->custnum : $opt{'custnum'}; my $invoice_time = $cust_bill ? $cust_bill->_date : $opt{'invoice_time'}; my $cust_main = FS::cust_main->by_key($custnum) if $custnum > 0; - if (!$cust_main) { - # better way to handle this? should we just assume that it's taxable? - die "unable to calculate taxes for an unknown customer\n"; - } - - # set a flag if the customer is tax-exempt - my $exempt_cust; - my $conf = FS::Conf->new; - if ( $conf->exists('cust_class-tax_exempt') ) { - my $cust_class = $cust_main->cust_class; - $exempt_cust = $cust_class->tax if $cust_class; - } else { - $exempt_cust = $cust_main->tax; - } - - # set a flag if the customer is exempt from this tax here - my $exempt_cust_taxname = $cust_main->tax_exemption($self->taxname) - if $self->taxname; + # (to avoid complications with estimated tax on quotations, assume it's + # taxable if there is no customer) + #if (!$cust_main) { + #die "unable to calculate taxes for an unknown customer\n"; + #} # Gather any exemptions that are already attached to these cust_bill_pkgs # so that we can deduct them from the customer's monthly limit. @@ -313,57 +301,29 @@ sub taxline { my @tax_location; foreach my $cust_bill_pkg (@$taxables) { - - my $cust_pkg = $cust_bill_pkg->cust_pkg; - my $part_pkg = $cust_bill_pkg->part_pkg; - - my @new_exemptions; - my $taxable_charged = $cust_bill_pkg->setup + $cust_bill_pkg->recur - or next; # don't create zero-amount exemptions - - # XXX the following procedure should probably be in cust_bill_pkg - - if ( $exempt_cust ) { - - push @new_exemptions, FS::cust_tax_exempt_pkg->new({ - amount => $taxable_charged, - exempt_cust => 'Y', - }); - $taxable_charged = 0; - - } elsif ( $exempt_cust_taxname ) { - - push @new_exemptions, FS::cust_tax_exempt_pkg->new({ - amount => $taxable_charged, - exempt_cust_taxname => 'Y', - }); - $taxable_charged = 0; - + # careful... may be a cust_bill_pkg or a quotation_pkg + + my $taxable_charged = $cust_bill_pkg->setup + $cust_bill_pkg->recur; + foreach ( grep { $_->taxnum == $self->taxnum } + @{ $cust_bill_pkg->cust_tax_exempt_pkg } + ) { + # deal with exemptions that have been set on this line item, and + # pertain to this tax def + $taxable_charged -= $_->amount; } - if ( ($part_pkg->setuptax eq 'Y' or $self->setuptax eq 'Y') - and $cust_bill_pkg->setup > 0 and $taxable_charged > 0 ) { + # can't determine the tax_locationnum directly for fees; they're not + # yet linked to an invoice + my $locationnum = $cust_bill_pkg->tax_locationnum + || $cust_main->ship_locationnum; - push @new_exemptions, FS::cust_tax_exempt_pkg->new({ - amount => $cust_bill_pkg->setup, - exempt_setup => 'Y' - }); - $taxable_charged -= $cust_bill_pkg->setup; - - } - if ( ($part_pkg->recurtax eq 'Y' or $self->recurtax eq 'Y') - and $cust_bill_pkg->recur > 0 and $taxable_charged > 0 ) { - - push @new_exemptions, FS::cust_tax_exempt_pkg->new({ - amount => $cust_bill_pkg->recur, - exempt_recur => 'Y' - }); - $taxable_charged -= $cust_bill_pkg->recur; - - } - + ### Monthly capped exemptions ### if ( $self->exempt_amount && $self->exempt_amount > 0 - and $taxable_charged > 0 ) { + and $taxable_charged > 0 + and $cust_main ) { + + # XXX monthly exemptions currently don't work on quotations + # If the billing period extends across multiple calendar months, # there may be several months of exemption available. my $sdate = $cust_bill_pkg->sdate || $invoice_time; @@ -460,13 +420,21 @@ sub taxline { : $remaining_exemption; $addl = $taxable_charged if $addl > $taxable_charged; - push @new_exemptions, FS::cust_tax_exempt_pkg->new({ + my $new_exemption = + FS::cust_tax_exempt_pkg->new({ amount => sprintf('%.2f', $addl), exempt_monthly => 'Y', year => $year, month => $mon, + taxnum => $self->taxnum, + taxtype => ref($self) }); $taxable_charged -= $addl; + + # create a record of it + push @{ $cust_bill_pkg->cust_tax_exempt_pkg }, $new_exemption; + # and allow it to be counted against the limit for other packages + push @existing_exemptions, $new_exemption; } # if they're using multiple months of exemption for a multi-month # package, then record the exemptions in separate months @@ -477,13 +445,7 @@ sub taxline { } } - } # if exempt_amount - - $_->taxnum($self->taxnum) foreach @new_exemptions; - - # attach them to the line item - push @{ $cust_bill_pkg->cust_tax_exempt_pkg }, @new_exemptions; - push @existing_exemptions, @new_exemptions; + } # if exempt_amount and $cust_main $taxable_charged = sprintf( "%.2f", $taxable_charged); next if $taxable_charged == 0; @@ -494,7 +456,7 @@ sub taxline { 'taxtype' => ref($self), 'cents' => $this_tax_cents, 'pkgnum' => $cust_bill_pkg->pkgnum, - 'locationnum' => $cust_bill_pkg->cust_pkg->tax_locationnum, + 'locationnum' => $locationnum, 'taxable_cust_bill_pkg' => $cust_bill_pkg, 'tax_cust_bill_pkg' => $tax_item, });