X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_pkg.html;h=27aececc944e8d6d904dd6ffb5a50c19c1d8b123;hp=e75a0985be612d4b5dafe419da2bcdecd88daf46;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=7427b3722522f049c9ebdb4ba3780a91b88c414f

diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index e75a0985b..27aececc9 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -190,7 +190,7 @@
     <& /elements/tr-title.html, value => mt('Location search options') &>
 
 %   my @location_options = qw(cust nocust census nocensus);
-%   if ( $conf->exists('enable_taxproducts') ) {
+%   if ( $conf->config('tax_data_vendor') eq 'cch' ) {
 %     push @location_options, 'geocode', 'nogeocode';
 %   }
     <& /elements/tr-checkbox-multiple.html,
@@ -204,7 +204,7 @@
                                'nogeocode'=> 'has an implicit tax location',
                                'geocode'  => 'has a hardcoded tax location',
                              },
-                'value'   => { map { $_ => 1 } @location_options },
+                'value'   => { map { $_ => 0 } @location_options },
     &>
 
     <& /elements/tr-title.html, value => mt('Display options') &>
@@ -260,7 +260,8 @@ my @date_fields = keys %label;
 #false laziness w/cust_pkg.cgi
 my %disable = (
   'all'             => {},
-  'not yet billed'  => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+  'on hold'         => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'expire'=>1, 'cancel'=>1, 'dundate'=> 1, },
+  'not yet billed'  => { 'setup'=>1, 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, 'dundate'=>1, },
   'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, 'contract_end'=>1, 'dundate'=>1, },
   'active'          => { 'susp'=>1, 'cancel'=>1 },
   'suspended'       => { 'cancel'=>1, 'dundate'=>1, },