combine ticket notification scrips, #15353

[freeside.git] / httemplate / elements / tr-select-taxproduct.html

diff --git a/httemplate/elements/tr-select-taxproduct.html b/httemplate/elements/tr-select-taxproduct.html
index f9f192a..759d0c0 100644 (file)
--- 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>
+  <%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>