From fba0d3390b1d53199777735ea0366b450aa2576b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Apr 2008 20:34:41 +0000
Subject: fix tax class on package def edit

---
 httemplate/elements/select-taxclass.html    | 4 +++-
 httemplate/elements/tr-select-taxclass.html | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'httemplate/elements')

diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
index 6fe35d32c..2d0db3068 100644
--- a/httemplate/elements/select-taxclass.html
+++ b/httemplate/elements/select-taxclass.html
@@ -22,7 +22,9 @@
 
 <%init>
 
-my( $selected_taxclass, %opt ) = @_;
+my %opt = @_;
+my $selected_taxclass = $opt{'curr_value'}; # || $opt{'value'} necessary?
+
 my $conf = new FS::Conf;
 
 unless ( $opt{'taxclasses'} ) {
diff --git a/httemplate/elements/tr-select-taxclass.html b/httemplate/elements/tr-select-taxclass.html
index 3bba683f8..7006b1ac7 100644
--- a/httemplate/elements/tr-select-taxclass.html
+++ b/httemplate/elements/tr-select-taxclass.html
@@ -2,22 +2,23 @@
 %      || scalar(@{ $opt{'taxclasses'} }) == 0
 % ) { 
 
-  <INPUT TYPE="hidden" NAME=""<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $taxclass %>">
+  <INPUT TYPE="hidden" NAME=""<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $selected_taxclass %>">
 
 % } else { 
 
   <TR>
     <TD ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TD>
     <TD>
-      <% include( '/elements/select-taxclass.html', $taxclass, %opt ) %>
+      <% include( '/elements/select-taxclass.html', 'curr_value' => $selected_taxclass, %opt ) %>
     </TD>
   </TR>
 
 % } 
 <%init>
 
-my( $taxclass, %opt ) = @_;
+my( %opt ) = @_;
 my $conf = new FS::Conf;
+my $selected_taxclass = $opt{'curr_value'}; # || $opt{'value'} necessary?
 
 unless ( $opt{'taxclasses'} ) {
 
-- 
cgit v1.2.1