477 tweaks, #24047

2 files changed, 21 insertions, 18 deletions

diff --git a/bin/convert-477-options b/bin/convert-477-options
index cce87bb0b..be37b4133 100755
--- a/bin/convert-477-options
+++ b/bin/convert-477-options
@@ -114,23 +114,25 @@ for my $part_pkg (qsearch('part_pkg', { freq => {op => '!=', value => '0'}})) {
   # other special stuff:
   # FCC voice class (VoIP OTT, VoIP + broadband, Wholesale VoIP, Local
   # Exchange) and DS0 equivalent lines
-  my $sessions = $part_pkg->fcc_ds0s || 1;
+  my $sessions = $part_pkg->fcc_ds0s;
 
-  if ($part_pkg->fcc_voip_class == 1) {
-    # VoIP OTT (connection not included)
-    push @fcc_opts, 'is_voip' => 1, 'voip_ott' => 1,
-                    'voip_sessions' => $sessions;
-  } elsif ( $part_pkg->fcc_voip_class == 2) {
-    # VoIP non-OTT; do not set is_broadband since the connection is not 
-    # necessarily general Internet access
-    push @fcc_opts, 'is_voip' => 1,
-                    'voip_sessions' => $sessions;
-  } elsif ( $part_pkg->fcc_voip_class == 3 ) {
-    # wholesale VoIP; apparently no longer reportable?
-  } else {
-    # local exchange telephone
-    push @fcc_opts, 'is_phone' => 1,
-                    'phone_lines' => $sessions;
+  if ( $sessions ) { # then this is a voice package of some kind
+    if ($part_pkg->fcc_voip_class == 1) {
+      # VoIP OTT (connection not included)
+      push @fcc_opts, 'is_voip' => 1, 'voip_ott' => 1,
+                      'voip_sessions' => $sessions;
+    } elsif ( $part_pkg->fcc_voip_class == 2) {
+      # VoIP non-OTT; do not set is_broadband since the connection is not 
+      # necessarily general Internet access
+      push @fcc_opts, 'is_voip' => 1,
+                      'voip_sessions' => $sessions;
+    } elsif ( $part_pkg->fcc_voip_class == 3 ) {
+      # wholesale VoIP; apparently no longer reportable?
+    } else {
+      # local exchange telephone
+      push @fcc_opts, 'is_phone' => 1,
+                      'phone_lines' => $sessions;
+    }
   }
 
   my %fcc_opts = @fcc_opts;
diff --git a/httemplate/browse/part_pkg-fcc.html b/httemplate/browse/part_pkg-fcc.html
index 4c9cea195..e3fd97ccf 100755
--- a/httemplate/browse/part_pkg-fcc.html
+++ b/httemplate/browse/part_pkg-fcc.html
@@ -94,8 +94,6 @@ my $select = join(',',
 my $addl_from = 
   FS::Report::FCC_477::join_optionnames(@optionnames);
 
-$cgi->param('classnum', $classnum) if length($classnum);
-
 my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
 
 my @header = ( '#', 'Package', 'Comment' );
@@ -203,6 +201,9 @@ my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD
   }
   </SCRIPT>!;
 
+# restore this only after creating $html_form
+$cgi->param('classnum', $classnum) if length($classnum);
+
 my $html_foot = qq!
   <INPUT TYPE="submit" VALUE="Save changes">
   </FORM>!;