autoload methods returning foreign records, RT#13971

4 files changed, 6 insertions, 36 deletions

diff --git a/FS/FS/invoice_mode.pm b/FS/FS/invoice_mode.pm
index 115dd44..3f0897d 100644
--- a/FS/FS/invoice_mode.pm
+++ b/FS/FS/invoice_mode.pm
@@ -1,8 +1,8 @@
 package FS::invoice_mode;
+use base qw(FS::Record);
 
 use strict;
-use base qw( FS::Record );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearchs ); #qsearch qsearchs );
 use FS::invoice_conf;
 
 =head1 NAME
@@ -138,13 +138,6 @@ sub invoice_conf {
 
 Returns the agent associated with this invoice mode, if any.
 
-=cut
-
-sub agent {
-  my $self = shift;
-  $self->agentnum ? FS::agent->by_key($self->agentnum) : '';
-}
-
 =back
 
 =head1 SEE ALSO
diff --git a/FS/FS/torrus_srvderive.pm b/FS/FS/torrus_srvderive.pm
index 8736b0d..007473b 100644
--- a/FS/FS/torrus_srvderive.pm
+++ b/FS/FS/torrus_srvderive.pm
@@ -1,9 +1,7 @@
 package FS::torrus_srvderive;
+use base qw( FS::m2name_Common FS::Record );
 
 use strict;
-use base qw( FS::m2name_Common FS::Record );
-use FS::Record qw( qsearch qsearchs );
-use FS::torrus_srvderive_component;
 
 =head1 NAME
 
@@ -114,11 +112,6 @@ sub check {
   $self->SUPER::check;
 }
 
-sub torrus_srvderive_component {
-  my $self = shift;
-  qsearch('torrus_srvderive_component', { 'derivenum' => $self->derivenum } );
-}
-
 sub component_serviceids {
   my $self = shift;
   map $_->serviceid, $self->torrus_srvderive_component;
diff --git a/FS/FS/torrus_srvderive_component.pm b/FS/FS/torrus_srvderive_component.pm
index b244d06..3332531 100644
--- a/FS/FS/torrus_srvderive_component.pm
+++ b/FS/FS/torrus_srvderive_component.pm
@@ -1,9 +1,7 @@
 package FS::torrus_srvderive_component;
+use base qw( FS::Record );
 
 use strict;
-use base qw( FS::Record );
-use FS::Record qw( qsearch qsearchs );
-use FS::torrus_srvderive;
 
 =head1 NAME
 
@@ -114,11 +112,6 @@ sub check {
   $self->SUPER::check;
 }
 
-sub torrus_srvderive {
-  my $self = shift;
-  qsearchs('torrus_srvderive', { 'derivenum' => $self->derivenum } );
-}
-
 =back
 
 =head1 BUGS
diff --git a/FS/FS/vend_bill_pay.pm b/FS/FS/vend_bill_pay.pm
index c10c9eb..165193f 100644
--- a/FS/FS/vend_bill_pay.pm
+++ b/FS/FS/vend_bill_pay.pm
@@ -1,10 +1,8 @@
 package FS::vend_bill_pay;
+use base qw( FS::Record );
 
 use strict;
-use base qw( FS::Record );
-use FS::Record qw( dbh qsearch ); #qsearchs );
-use FS::vend_bill;
-use FS::vend_pay;
+use FS::Record qw( dbh ); #qsearch #qsearchs );
 
 =head1 NAME
 
@@ -135,13 +133,6 @@ sub check {
 
 =item vend_pay
 
-=cut
-
-sub vend_pay {
-  my $self = shift;
-  qsearch('vend_pay', { 'vendpaynum', $self->vendpaynum });
-}
-
 =back
 
 =head1 BUGS