Rollback part_pkg.def_svcpart changes.

3 files changed, 3 insertions, 19 deletions

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index fd269bef1..c20811491 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -81,8 +81,7 @@ END
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
     print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A>",
-          (($hashref->{def_svcpart} == $svcpart) ? "*</TD><TD>" : "</TD><TD>"),
+          $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
   }
@@ -94,7 +93,6 @@ $colspan = $cgi->param('showdisabled') ? 8 : 9;
 print <<END;
    <TR><TD COLSPAN=$colspan><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
     </TABLE>
-    &nbsp* - Default service
   </BODY>
 </HTML>
 END
diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html
index e2a0f475a..2b8b3a132 100644
--- a/httemplate/docs/schema.html
+++ b/httemplate/docs/schema.html
@@ -238,7 +238,6 @@
         <li>plan - price plan
         <li>plandata - additional price plan data
         <li>disabled - Disabled flag, empty or `Y'
-        <li>def_svcpart - Default svcpart to use when ordering this part_pkg
       </ul>
     <li><a name="part_referral" href="man/FS/part_referral.html">part_referral</a> - Referral listing
       <ul>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 770facb7e..e03017db4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -112,10 +112,7 @@ print '>';
 print '</TD></TR></TABLE>';
 
 my $thead =  "\n\n". ntable('#cccccc', 2). <<END;
-<TR>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>
-<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Service</FONT></TH>
-</TR>
+<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH><TH BGCOLOR="#dcdcdc">Service</TH></TR>
 END
 
 #unless ( $cgi->param('clone') ) {
@@ -172,16 +169,6 @@ unless ( 0 ) {
   #print "</TR></TABLE>";
 }
 
-print qq!Default service <SELECT NAME="def_svcpart" onChange="fchanged(this)">!,
-      qq!<OPTION VALUE="0">None!;
-foreach my $part_svc ( @part_svc ) {
-  print qq!<OPTION VALUE="!, $part_svc->svcpart, '"',
-        (($hashref->{def_svcpart} == $part_svc->svcpart) ? " SELECTED>" : ">"),
-        $part_svc->svc, qq!</OPTION>!;
-}
-print qq!</SELECT><BR>\n!;
-
-
 foreach my $f ( qw( clone pkgnum ) ) {
   print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
 }
@@ -389,7 +376,7 @@ my $widget = new HTML::Widgets::SelectLayers(
   'form_action'    => 'process/part_pkg.cgi',
   'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
   'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_select'    => [ qw(def_svcpart), @form_select ],
+  'form_select'    => [ @form_select ],
   'fixup_callback' => sub {
                         #my $ = @_;
                         my $html = '';