backport select_list changes from 1.5 so the fix for #118 works in 1.4 branch too

[freeside.git] / FS / FS / svc_Common.pm

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index a223266..315b7c0 100644 (file)
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -2,7 +2,7 @@ package FS::svc_Common;
 
 use strict;
 use vars qw( @ISA $noexport_hack $DEBUG );
-use FS::Record qw( qsearch qsearchs fields dbh );
+use FS::Record qw( qsearchs fields dbh );
 use FS::cust_svc;
 use FS::part_svc;
 use FS::queue;
@@ -31,60 +31,6 @@ inherit from, i.e. FS::svc_acct.  FS::svc_Common inherits from FS::Record.
 
 =over 4
 
-=cut
-
-sub virtual_fields {
-
-  # This restricts the fields based on part_svc_column and the svcpart of 
-  # the service.  There are four possible cases:
-  # 1.  svcpart passed as part of the svc_x hash.
-  # 2.  svcpart fetched via cust_svc based on svcnum.
-  # 3.  No svcnum or svcpart.  In this case, return ALL the fields with 
-  #     dbtable eq $self->table.
-  # 4.  Called via "fields('svc_acct')" or something similar.  In this case
-  #     there is no $self object.
-
-  my $self = shift;
-  my $svcpart;
-  my @vfields = $self->SUPER::virtual_fields;
-
-  return @vfields unless (ref $self); # Case 4
-
-  if ($self->svcpart) { # Case 1
-    $svcpart = $self->svcpart;
-  } elsif ( $self->svcnum
-            && qsearchs('cust_svc',{'svcnum'=>$self->svcnum} )
-          ) { #Case 2
-    $svcpart = $self->cust_svc->svcpart;
-  } else { # Case 3
-    $svcpart = '';
-  }
-
-  if ($svcpart) { #Cases 1 and 2
-    my %flags = map { $_->columnname, $_->columnflag } (
-        qsearch ('part_svc_column', { svcpart => $svcpart } )
-      );
-    return grep { not ($flags{$_} eq 'X') } @vfields;
-  } else { # Case 3
-    return @vfields;
-  } 
-  return ();
-}
-
-=item check
-
-Checks the validity of fields in this record.
-
-At present, this does nothing but call FS::Record::check (which, in turn, 
-does nothing but run virtual field checks).
-
-=cut
-
-sub check {
-  my $self = shift;
-  $self->SUPER::check;
-}
-
 =item insert [ , OPTION => VALUE ... ]
 
 Adds this record to the database.  If there is an error, returns the error,
@@ -368,7 +314,7 @@ sub setx {
 
   #set default/fixed/whatever fields from part_svc
   my $table = $self->table;
-  foreach my $field ( grep { $_ ne 'svcnum' } $self->fields ) {
+  foreach my $field ( grep { $_ ne 'svcnum' } fields($table) ) {
     my $part_svc_column = $part_svc->part_svc_column($field);
     if ( $part_svc_column->columnflag eq $x ) {
       $self->setfield( $field, $part_svc_column->columnvalue );
@@ -500,6 +446,10 @@ sub clone_kludge_unsuspend {
 
 =back
 
+=head1 VERSION
+
+$Id: svc_Common.pm,v 1.12.4.6 2004-03-03 13:44:27 ivan Exp $
+
 =head1 BUGS
 
 The setfixed method return value.