X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_svc.cgi;h=deb3c80f9e641c50ff7ef780376863c4087f88fe;hb=cf4ffd334502af562e924c24376333200073ccb8;hp=4b8a2408037488038c1fdb5672d214c0ff4cff72;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 4b8a24080..deb3c80f9 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,7 +131,14 @@ that field.
 %
 %      #yucky kludge
 %      my @fields = defined( dbdef->table($layer) )
-%                      ? grep { $_ ne 'svcnum' } fields($layer)
+%                      ? grep {
+%                               $_ ne 'svcnum' &&
+%                               ( !FS::part_svc->svc_table_fields($layer)
+%                                     ->{$_}->{disable_part_svc_column}   ||
+%                                 $part_svc->part_svc_column($_)->columnflag
+%                               )
+%                             }
+%                             fields($layer)
 %                      : ();
 %      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
 %      $part_svc->svcpart($clone) if $clone; #haha, undone below
@@ -261,9 +268,10 @@ that field.
 %          if ( $def->{select_table} ) {
 %            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
 %              my $rvalue = $record->getfield($def->{select_key});
+%              my $select_label = $def->{select_label};
 %              $html .= qq!<OPTION VALUE="$rvalue"!.
 %                  (grep(/^$rvalue$/, split(',',$value)) ? ' SELECTED>' : '>' ).
-%                  $record->getfield($def->{select_label}). '</OPTION>';
+%                  $record->$select_label(). '</OPTION>';
 %            } #next $record
 %          } else { # select_list
 %            foreach my $item ( @{$def->{select_list}} ) {