projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
censustract upgrade should skip prospect locations, #25660
[freeside.git]
/
FS
/
FS
/
tax_rate.pm
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
2653833
..
095939f
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-413,7
+413,7
@@
sub taxline {
}
my $maxtype = $self->maxtype || 0;
}
my $maxtype = $self->maxtype || 0;
- if ($maxtype != 0 && $maxtype != 9) {
+ if ($maxtype != 0 && $maxtype !=
1 && $maxtype !=
9) {
return $self->_fatal_or_null( 'tax with "'.
$self->maxtype_name. '" threshold'
);
return $self->_fatal_or_null( 'tax with "'.
$self->maxtype_name. '" threshold'
);
@@
-476,12
+476,12
@@
sub taxline {
}
}
- #
- # XXX insert exemption handling here
+ # XXX handle excessrate (use_excessrate) / excessfee /
+ # taxbase/feebase / taxmax/feemax
+ # and eventually exemptions
#
# the tax or fee is applied to taxbase or feebase and then
# the excessrate or excess fee is applied to taxmax or feemax
#
# the tax or fee is applied to taxbase or feebase and then
# the excessrate or excess fee is applied to taxmax or feemax
- #
$amount += $taxable_charged * $self->tax;
$amount += $taxable_units * $self->fee;
$amount += $taxable_charged * $self->tax;
$amount += $taxable_units * $self->fee;
@@
-514,10
+514,10
@@
sub _fatal_or_null {
}
}
}
}
-=item tax_on_tax CUST_
MAI
N
+=item tax_on_tax CUST_
LOCATIO
N
Returns a list of taxes which are candidates for taxing taxes for the
Returns a list of taxes which are candidates for taxing taxes for the
-given
customer (see L<FS::cust_mai
n>)
+given
service location (see L<FS::cust_locatio
n>)
=cut
=cut
@@
-525,13
+525,13
@@
given customer (see L<FS::cust_main>)
sub tax_on_tax {
#akshun
my $self = shift;
sub tax_on_tax {
#akshun
my $self = shift;
- my $cust_
mai
n = shift;
+ my $cust_
locatio
n = shift;
warn "looking up taxes on tax ". $self->taxnum. " for customer ".
warn "looking up taxes on tax ". $self->taxnum. " for customer ".
- $cust_
mai
n->custnum
+ $cust_
locatio
n->custnum
if $DEBUG;
if $DEBUG;
- my $geocode = $cust_
mai
n->geocode($self->data_vendor);
+ my $geocode = $cust_
locatio
n->geocode($self->data_vendor);
# CCH oddness in m2m
my $dbh = dbh;
# CCH oddness in m2m
my $dbh = dbh;
@@
-2120,8
+2120,7
@@
EOF
=head1 SEE ALSO
=head1 SEE ALSO
-L<FS::Record>, L<FS::cust_main>, L<FS::cust_bill>, schema.html from the base
-documentation.
+L<FS::Record>, L<FS::cust_location>, L<FS::cust_bill>
=cut
=cut