From 817c1ce0e1cbcfd1f684222c66f46dd13b2d6dd7 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Sat, 30 May 2015 15:12:07 -0700 Subject: SureTax, #31639, #33015, #34598 --- httemplate/edit/process/part_pkg.cgi | 2 +- httemplate/edit/process/quick-charge.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'httemplate/edit/process') diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index eda3f33d4..f3ee06157 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -117,7 +117,7 @@ my $args_callback = sub { $error ||= "Illegal $param: $value" unless ( $value =~ /^\d*$/ ); if (length($class)) { - $options{"usage_taxproductnum_$_"} = $value; + $options{"usage_taxproductnum_$class"} = $value; } else { $new->set('taxproductnum', $value); } diff --git a/httemplate/edit/process/quick-charge.cgi b/httemplate/edit/process/quick-charge.cgi index c1e7fc159..23eead451 100644 --- a/httemplate/edit/process/quick-charge.cgi +++ b/httemplate/edit/process/quick-charge.cgi @@ -74,7 +74,7 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge if ( $param->{'taxclass'} eq '(select)' ) { $error .= "Must select a tax class. " - unless ($conf->exists('enable_taxproducts') && + unless ($conf->config('tax_data_vendor') && ( $override || $param->{taxproductnum} ) ); $cgi->param('taxclass', ''); @@ -122,7 +122,7 @@ if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) { #modifying an existing one-time charge if ( $param->{'taxclass'} eq '(select)' ) { $error .= "Must select a tax class. " - unless ($conf->exists('enable_taxproducts') && + unless ($conf->config('tax_data_vendor')) ( $override || $param->{taxproductnum} ) ); $cgi->param('taxclass', ''); -- cgit v1.2.1