X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-taxproduct.html;h=547f06626c8d716fd507ffb854dc2af12e0d3695;hp=f9f192a28b95c89d5b833c1138d14a8474c386f1;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hpb=4ec6dfa446447d68663b01fbfda07c0bd2fcb3ae

diff --git a/httemplate/elements/tr-select-taxproduct.html b/httemplate/elements/tr-select-taxproduct.html
index f9f192a28..547f06626 100644
--- a/httemplate/elements/tr-select-taxproduct.html
+++ b/httemplate/elements/tr-select-taxproduct.html
@@ -1,22 +1,18 @@
-% if ( $conf->exists('enable_taxproducts') ) { 
-
-    <TR>
-      <TD COLSPAN="2">
-        <% include('select-taxproduct.html', @_) %>
-      </TD>
-    </TR>
+% if ( $conf->config('tax_data_vendor') ) { # still not quite right
+  <%include('tr-td-label.html', @_) %>
+    <TD <% $cell_style %>><% include('select-taxproduct.html', @_) %></TD>
+  </TR>
 
 % } else { 
-
-    <INPUT TYPE="hidden" NAME="taxproductnum" VALUE="<% $opt{taxproductnum} %>">
-    <INPUT TYPE="hidden" NAME="tax_override"  VALUE="<% $opt{tax_override}  %>">
-
+  <INPUT TYPE="hidden" NAME="<% $name %>" VALUE="<% $opt{value} %>">
 % } 
 
 <%init>
 
-my $conf = new FS::Conf; 
+my $conf = new FS::Conf;
 
 my %opt = @_;
+my $cell_style = $opt{cell_style} ? 'STYLE="'. $opt{cell_style}. '"' : '';
+my $name = $opt{element_name} || $opt{field} || 'taxproductnum';
 
 </%init>