X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Ftype_pkgs.pm;h=8cc2345ff7a33c521324348f1bfc5052ad0dc582;hp=5b3b11c096c0c2aab2aaa96c3a3ddf6952b3a451;hb=5372897f367498972c96f5494e142e6e11b29eb8;hpb=58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828

diff --git a/FS/FS/type_pkgs.pm b/FS/FS/type_pkgs.pm
index 5b3b11c09..8cc2345ff 100644
--- a/FS/FS/type_pkgs.pm
+++ b/FS/FS/type_pkgs.pm
@@ -1,12 +1,7 @@
 package FS::type_pkgs;
+use base qw( FS::Record );
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearchs );
-use FS::agent_type;
-use FS::part_pkg;
-
-@ISA = qw( FS::Record );
 
 =head1 NAME
 
@@ -35,6 +30,8 @@ FS::Record.  The following fields are currently supported:
 
 =over 4
 
+=item typepkgnum - primary key
+
 =item typenum - Agent type, see L<FS::agent_type>
 
 =item pkgpart - Billing item definition, see L<FS::part_pkg>
@@ -80,17 +77,12 @@ sub check {
   my $self = shift;
 
   my $error = 
-    $self->ut_number('typenum')
-    || $self->ut_number('pkgpart')
+       $self->ut_numbern('typepkgnum')
+    || $self->ut_foreign_key('typenum', 'agent_type', 'typenum' )
+    || $self->ut_foreign_key('pkgpart', 'part_pkg',   'pkgpart' )
   ;
   return $error if $error;
 
-  return "Unknown typenum"
-    unless qsearchs( 'agent_type', { 'typenum' => $self->typenum } );
-
-  return "Unknown pkgpart"
-    unless qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-
   $self->SUPER::check;
 }
 
@@ -98,26 +90,19 @@ sub check {
 
 Returns the FS::part_pkg object associated with this record.
 
-=cut
+=item agent_type
 
-sub part_pkg {
-  my $self = shift;
-  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
-}
+Returns the FS::agent_type object associated with this record.
 
 =cut
 
 =back
 
-=head1 VERSION
-
-$Id: type_pkgs.pm,v 1.3 2003-08-05 00:20:48 khoff Exp $
-
 =head1 BUGS
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::agent_type>, L<FS::part_pkgs>, schema.html from the base
+L<FS::Record>, L<FS::agent_type>, L<FS::part_pkg>, schema.html from the base
 documentation.
 
 =cut