projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c32372
)
handle CCH maxtype = 1 taxes, RT#19150
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 8 May 2013 21:23:27 +0000
(14:23 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 8 May 2013 21:23:27 +0000
(14:23 -0700)
FS/FS/tax_rate.pm
patch
|
blob
|
history
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
2653833
..
342c7cb
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;