projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strip _ out of MAC address fields, #19114
[freeside.git]
/
FS
/
FS
/
cust_main_county.pm
diff --git
a/FS/FS/cust_main_county.pm
b/FS/FS/cust_main_county.pm
index
db6be75
..
fb80809
100644
(file)
--- a/
FS/FS/cust_main_county.pm
+++ b/
FS/FS/cust_main_county.pm
@@
-498,6
+498,8
@@
sub taxline {
'taxnum' => $self->taxnum,
'taxtype' => ref($self),
'cents' => $this_tax_cents,
'taxnum' => $self->taxnum,
'taxtype' => ref($self),
'cents' => $this_tax_cents,
+ 'pkgnum' => $cust_bill_pkg->pkgnum,
+ 'locationnum' => $cust_bill_pkg->cust_pkg->tax_locationnum,
'taxable_cust_bill_pkg' => $cust_bill_pkg,
'tax_cust_bill_pkg' => $tax_item,
});
'taxable_cust_bill_pkg' => $cust_bill_pkg,
'tax_cust_bill_pkg' => $tax_item,
});
@@
-510,8
+512,10
@@
sub taxline {
# now round and distribute
my $extra_cents = sprintf('%.2f', $taxable_cents * $self->tax / 100) * 100
- $tax_cents;
# now round and distribute
my $extra_cents = sprintf('%.2f', $taxable_cents * $self->tax / 100) * 100
- $tax_cents;
+ # make sure we have an integer
+ $extra_cents = sprintf('%.0f', $extra_cents);
if ( $extra_cents < 0 ) {
if ( $extra_cents < 0 ) {
- die "nonsense extra_cents value $extra_cents";
# because seriously, wtf
+ die "nonsense extra_cents value $extra_cents";
}
$tax_cents += $extra_cents;
my $i = 0;
}
$tax_cents += $extra_cents;
my $i = 0;