correct package editor when taxproducts off

4 files changed, 18 insertions, 5 deletions

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 0250153c1..83524756e 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -230,6 +230,11 @@ Example:
 %     'disabled'      => $f->{'disabled'},
 %   );
 %
+%   #selectlayers, others?
+%   $include_common{$_} = $f->{$_}
+%     foreach grep exists($f->{$_}),
+%                  qw( js_only html_only select_only layers_only cell_style);
+%
 %   #select-*
 %   $include_common{$_} = $f->{$_}
 %     foreach grep exists($f->{$_}), qw( empty_label );
@@ -365,7 +370,7 @@ Example:
 %     'object'     => $object,
 %     'cgi'        => $cgi,
 %     'onchange'   => $onchange,
-%     'cell_style'   => ( $fieldnum ? 'border-top:1px solid black' : '' ),
+%     ( $fieldnum ? ('cell_style' => 'border-top:1px solid black') : () ),
 %   );
 
     <% include( @include ) %>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 3968c8913..ccce8308c 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -97,6 +97,11 @@
                                            },
                                 layer_fields => \%taxproduct_fields,
                                 layer_values_callback => $taxproduct_values,
+                                layers_only  =>   !$taxproducts,
+                                cell_style   => ( !$taxproducts
+                                                  ? 'display:none'
+                                                  : ''
+                                                ),
                               },
 
                               { type  => 'tablebreak-tr-title',
@@ -167,6 +172,9 @@ die "access denied"
       || $curuser->access_right('Edit global package definitions')
       || ( $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') );
 
+my $conf = new FS::Conf;
+my $taxproducts = $conf->exists('enable_taxproducts');
+
 #XXX
 # - tr-part_pkg_freq: month_increments_only (from price plans)
 # - test cloning
diff --git a/httemplate/elements/tr-select-taxoverride.html b/httemplate/elements/tr-select-taxoverride.html
index 4954a5566..e20d37efd 100644
--- a/httemplate/elements/tr-select-taxoverride.html
+++ b/httemplate/elements/tr-select-taxoverride.html
@@ -9,10 +9,10 @@
 
 <%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{name} || 'tax_override';
+my $name = $opt{element_name} || $opt{field} || 'tax_override';
 
 </%init>
diff --git a/httemplate/elements/tr-select-taxproduct.html b/httemplate/elements/tr-select-taxproduct.html
index 951222475..759d0c01c 100644
--- a/httemplate/elements/tr-select-taxproduct.html
+++ b/httemplate/elements/tr-select-taxproduct.html
@@ -9,10 +9,10 @@
 
 <%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{name} || 'taxproductnum';
+my $name = $opt{element_name} || $opt{field} || 'taxproductnum';
 
 </%init>