X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fselect-taxclass.html;h=6845d23605c2c6631ed54f1d97e4ad0150b7d048;hp=2504a5b1d49c92bf304017468c4f2be24f31aa14;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=5703b343f5a7184814e8e545e123c1544af2c521

diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
index 2504a5b1d..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 %>">
 
 % } 
 
@@ -30,9 +30,9 @@ my $conf = new FS::Conf;
 unless ( $opt{'taxclasses'} ) {
 
   #my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-  my $sth = dbh->prepare('SELECT taxclass FROM part_pkg_taxclass')
+  my $sth = dbh->prepare("SELECT taxclass FROM part_pkg_taxclass WHERE disabled IS NULL OR disabled = '' OR taxclass = ?")
     or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
+  $sth->execute($selected_taxclass) or die $sth->errstr;
   my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
   @{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;