diff options
| author | Mark Wells <mark@freeside.biz> | 2015-05-30 15:12:07 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-05-30 15:12:07 -0700 |
| commit | 817c1ce0e1cbcfd1f684222c66f46dd13b2d6dd7 (patch) | |
| tree | 25fd80fae19bbe1b4ec2c892a35a631cf232d590 /httemplate/misc | |
| parent | 3846acae1c2a7ecb275e400cf3802ada6bc89ed2 (diff) | |
SureTax, #31639, #33015, #34598
Diffstat (limited to 'httemplate/misc')
| -rw-r--r-- | httemplate/misc/choose_tax_location.html | 2 | ||||
| -rw-r--r-- | httemplate/misc/tax-import.cgi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/httemplate/misc/choose_tax_location.html b/httemplate/misc/choose_tax_location.html index 9c5881fd4..2eb5ab98e 100644 --- a/httemplate/misc/choose_tax_location.html +++ b/httemplate/misc/choose_tax_location.html @@ -38,7 +38,7 @@ my $conf = new FS::Conf; my $tax_engine = FS::TaxEngine->new; my %location; -($location{data_vendor}) = $conf->config('enable_taxproducts'); +($location{data_vendor}) = $conf->config('tax_data_vendor'); ($location{city}) = $cgi->param('city') =~ /^([\w ]+)$/; ($location{state}) = $cgi->param('state') =~ /^(\w+)$/; ($location{zip}) = $cgi->param('zip') =~ /^([-\w ]+)$/; diff --git a/httemplate/misc/tax-import.cgi b/httemplate/misc/tax-import.cgi index 7e72c74e3..9581a7975 100644 --- a/httemplate/misc/tax-import.cgi +++ b/httemplate/misc/tax-import.cgi @@ -60,10 +60,10 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Import'); my $conf = FS::Conf->new; -my $data_vendor = $conf->config('enable_taxproducts'); +my $data_vendor = $conf->config('tax_data_vendor'); my %vendor_info = ( - CCH => { + cch => { 'num_files' => 6, 'formats' => [ 'cch' => 'CCH import (CSV)', 'cch-fixed' => 'CCH import (fixed length)' ], @@ -82,7 +82,7 @@ my %vendor_info = ( 'detail filename', ], }, - Billsoft => { + billsoft => { 'num_files' => 1, 'formats' => [ 'billsoft-pcode' => 'Billsoft PCodes', 'billsoft-taxclass' => 'Tax classes', |