X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-taxclass.html;h=6845d23605c2c6631ed54f1d97e4ad0150b7d048;hb=3fc0a546caf38b444b63744726c5080ce5d9bbbb;hp=2d0db30689fdc987a9b9812275789bb5c97abec1;hpb=fba0d3390b1d53199777735ea0366b450aa2576b;p=freeside.git

diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
index 2d0db3068..6845d2360 100644
--- a/httemplate/elements/select-taxclass.html
+++ b/httemplate/elements/select-taxclass.html
@@ -1,6 +1,6 @@
 % if ( $conf->exists('enable_taxclasses') ) { 
 
-    <SELECT NAME="<% $opt{'name'} || 'taxclass' %>">
+    <SELECT NAME="<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>">
 
 %   if ( $conf->exists('require_taxclasses') ) { 
         <OPTION VALUE="(select)">Select tax class
@@ -16,7 +16,7 @@
 
 % } else { 
 
-  <INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $selected_taxclass %>">
+  <INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $selected_taxclass %>">
 
 % } 
 
@@ -29,9 +29,10 @@ my $conf = new FS::Conf;
 
 unless ( $opt{'taxclasses'} ) {
 
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-     or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
+  #my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+  my $sth = dbh->prepare("SELECT taxclass FROM part_pkg_taxclass WHERE disabled IS NULL OR disabled = '' OR taxclass = ?")
+    or die dbh->errstr;
+  $sth->execute($selected_taxclass) or die $sth->errstr;
   my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
   @{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;