[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 06bbcac96515601c138e032244d41c8cf9af45c7
Ivan
ivan at 420.am
Wed May 8 14:23:32 PDT 2013
The branch, FREESIDE_2_3_BRANCH has been updated
via 06bbcac96515601c138e032244d41c8cf9af45c7 (commit)
from a98df209df595eef7e7b5407e7c39e4e1983a9bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 06bbcac96515601c138e032244d41c8cf9af45c7
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed May 8 14:23:29 2013 -0700
handle CCH maxtype = 1 taxes, RT#19150
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 2653833..342c7cb 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -413,7 +413,7 @@ sub taxline {
}
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'
);
@@ -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
- #
$amount += $taxable_charged * $self->tax;
$amount += $taxable_units * $self->fee;
-----------------------------------------------------------------------
Summary of changes:
FS/FS/tax_rate.pm | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
More information about the freeside-commits
mailing list