remove obsolete FCC DS0 options

diff --git a/httemplate/browse/pkg_class.html b/httemplate/browse/pkg_class.html
index 2aa2857..eb33c0f 100644 (file)
--- a/httemplate/browse/pkg_class.html
+++ b/httemplate/browse/pkg_class.html
@@ -5,6 +5,7 @@
                  'disableable' => 1,
                  'disabled_statuspos' => 2,
                  'query'       => { 'table'     => 'pkg_class',
+                                    'addl_from' => ' LEFT JOIN pkg_category USING (categorynum)',
                                     'hashref'   => {},
                                     'order_by' => 'ORDER BY classnum',
                                   },
@@ -34,12 +35,6 @@ my $header = [ '#', 'Class' ];
 my $fields = [ 'classnum', 'classname' ];
 my $links  = [ $link, $link ];
 
-if($conf->exists('cust_main-require_censustract')) {
-    push @{$fields}, 'fcc_ds0s';
-    push @{$header}, 'FCC form 477 voice-grade equivalents';
-    push @{$links}, '';
-}
-
 my $cat_query = 'SELECT COUNT(*) FROM pkg_class where categorynum IS NOT NULL';
 my $sth = dbh->prepare($cat_query)
   or die "Error preparing $cat_query: ". dbh->errstr;

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 1702a6d..6629407 100755 (executable)
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -68,8 +68,6 @@
                    'svc_dst_pkgpart'  => 'Include services of package',
                    'supp_dst_pkgpart' => 'When ordering package, also order',
                    'report_option'    => 'Report classes',
-                   'fcc_ds0s'         => 'Voice-grade equivalents',
-                   'fcc_voip_class'   => 'Category',
                    'delay_start'      => 'Default delay (days)',
                  },
 

diff --git a/httemplate/edit/pkg_class.html b/httemplate/edit/pkg_class.html
index 95c6f30..498c34a 100644 (file)
--- a/httemplate/edit/pkg_class.html
+++ b/httemplate/edit/pkg_class.html
@@ -1,16 +1,4 @@
-<% include( 'elements/class_Common.html',
-              'name_singular'   => 'Package Class',
-              'table'  => 'pkg_class',
-              %opt,
-          )
-%>
-<%init>
-
-my $conf = new FS::Conf;
-
-my %opt = ();
-if($conf->exists('cust_main-require_censustract')) {
- $opt{'addl_fields'} = [ 'fcc_ds0s' ];
- $opt{'addl_labels'} = { 'fcc_ds0s' => 'FCC form 477 voice-grade equivalents' };
-}
-</%init>
+<& elements/class_Common.html,
+  'name_singular'   => 'Package Class',
+  'table'  => 'pkg_class',
+&>