projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tax-pkg_location changes broke new taxation, this should fix
[freeside.git]
/
FS
/
FS
/
tax_rate.pm
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
bd981e3
..
95d1c60
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-369,8
+369,12
@@
sub taxline {
if ($self->passtype == 2);
my $amount = 0;
if ($self->passtype == 2);
my $amount = 0;
- return [$name, $amount] # we always know how to handle disabled taxes
- if $self->disabled;
+ if ( $self->disabled ) { # we always know how to handle disabled taxes
+ return {
+ 'name' => $name,
+ 'amount' => $amount,
+ };
+ }
my $taxable_charged = 0;
my @cust_bill_pkg = grep { $taxable_charged += $_ unless ref; ref; }
my $taxable_charged = 0;
my @cust_bill_pkg = grep { $taxable_charged += $_ unless ref; ref; }
@@
-781,13
+785,13
@@
sub batch_import {
}
}
-=item process_batch
+=item process_batch
_import
Load a batch import as a queued JSRPC job
=cut
Load a batch import as a queued JSRPC job
=cut
-sub process_batch {
+sub process_batch
_import
{
my $job = shift;
my $param = thaw(decode_base64(shift));
my $job = shift;
my $param = thaw(decode_base64(shift));