Fixed bug with $routernum and new routers. Navigation cleanup.

[freeside.git] / httemplate / edit / part_svc.cgi

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index f1d42f3..d4bb470 100755 (executable)
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -154,17 +154,18 @@ my %defs = (
       my @part_export =
         map { qsearch( 'part_export', {exporttype => $_ } ) }
           keys %{FS::part_export::export_info($layer)};
-     $html .= '<BR><BR>'. table().
+      $html .= '<BR><BR>'. table().
                table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
         $html .= 'CHECKED'
-          if qsearchs( 'export_svc', {
+          if ( $clone || $part_svc->svcpart ) #null svcpart search causing error
+              && qsearchs( 'export_svc', {
                                    exportnum => $part_export->exportnum,
                                    svcpart   => $clone || $part_svc->svcpart });
-        $html .= '> '. $part_export->exporttype. ' to '. $part_export->machine.
-                 '</TD>';
+        $html .= '>'. $part_export->exportnum. ': '. $part_export->exporttype.
+                 ' to '. $part_export->machine. '</TD>';
         $count++;
         $html .= '</TR><TR>' unless $count % $columns;
       }
@@ -191,20 +192,20 @@ my %defs = (
         $html .= "<TR><TD>$field";
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
+        $flag = '' if ref($def) && $def->{type} eq 'disabled';
+        $html .=
+          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
+          ' CHECKED'x($flag eq ''). ">Off</TD>".
+          '<TD>';
+        unless ( ref($def) && $def->{type} eq 'disabled' ) {
+          $html .= 
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
+            ' CHECKED'x($flag eq 'D'). ">Default ".
+            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
+            ' CHECKED'x($flag eq 'F'). ">Fixed ".
+            '<BR>';
+        }
         if ( ref($def) ) {
-          $flag = '' if $def->{type} eq 'disabled';
-          $html .=
-            qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-            ' CHECKED'x($flag eq ''). ">Off</TD>".
-            '<TD>';
-          unless ( $def->{type} eq 'disabled' ) {
-            $html .= 
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-              ' CHECKED'x($flag eq 'D'). ">Default ".
-              qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-              ' CHECKED'x($flag eq 'F'). ">Fixed ".
-              '<BR>';
-          }
           if ( $def->{type} eq 'select' ) {
             $html .= qq!<SELECT NAME="${layer}__${field}">!;
             $html .= '<OPTION> </OPTION>' unless $value;