X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-taxclass.html;h=2504a5b1d49c92bf304017468c4f2be24f31aa14;hb=a04f7d97cd3e57ee9061fba5f737d6d77c782c13;hp=3c1558b72db8c0ba5b171273f0a5167a4754e078;hpb=89cb729e71c400307f47eef8e9e0b295db2dfca0;p=freeside.git

diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
index 3c1558b72..2504a5b1d 100644
--- a/httemplate/elements/select-taxclass.html
+++ b/httemplate/elements/select-taxclass.html
@@ -1,6 +1,6 @@
 % if ( $conf->exists('enable_taxclasses') ) { 
 
-    <SELECT NAME="taxclass">
+    <SELECT NAME="<% $opt{'name'} || 'taxclass' %>">
 
 %   if ( $conf->exists('require_taxclasses') ) { 
         <OPTION VALUE="(select)">Select tax class
@@ -22,13 +22,16 @@
 
 <%init>
 
-my( $selected_taxclass, %opt ) = @_;
+my %opt = @_;
+my $selected_taxclass = $opt{'curr_value'}; # || $opt{'value'} necessary?
+
 my $conf = new FS::Conf;
 
 unless ( $opt{'taxclasses'} ) {
 
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-     or die dbh->errstr;
+  #my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+  my $sth = dbh->prepare('SELECT taxclass FROM part_pkg_taxclass')
+    or die dbh->errstr;
   $sth->execute or die $sth->errstr;
   my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
   @{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;