diff options
| author | ivan <ivan> | 2009-01-19 23:54:24 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-01-19 23:54:24 +0000 |
| commit | 886bb19dcecea5ba61a17db159fd20225582f16e (patch) | |
| tree | 1a62d2ede6769ebf9bca46888340661ac2d49f49 | |
| parent | 6e47ff2bf17a5d52dcc4ad8a73f2cc197f9ec62b (diff) | |
tax-pkg_location changes broke new taxation, this should fix
| -rw-r--r-- | FS/FS/tax_rate.pm | 12 | ||||
| -rw-r--r-- | httemplate/misc/process/tax-import.cgi | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index bd981e301..95d1c60fd 100644 --- 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; - 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; } @@ -781,13 +785,13 @@ sub batch_import { } -=item process_batch +=item process_batch_import 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)); diff --git a/httemplate/misc/process/tax-import.cgi b/httemplate/misc/process/tax-import.cgi index f66d6db29..016d4b60c 100644 --- a/httemplate/misc/process/tax-import.cgi +++ b/httemplate/misc/process/tax-import.cgi @@ -4,6 +4,6 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Resend invoices'); -my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch', $cgi; +my $server = new FS::UI::Web::JSRPC 'FS::tax_rate::process_batch_import', $cgi; </%init> |