This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

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

diff --git a/FS/FS/agent_type.pm b/FS/FS/agent_type.pm
index 5d6b94e..2660bb4 100644 (file)
--- a/FS/FS/agent_type.pm
+++ b/FS/FS/agent_type.pm
@@ -2,7 +2,7 @@ package FS::agent_type;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch dbh );
+use FS::Record qw( qsearch );
 use FS::m2m_Common;
 use FS::agent;
 use FS::type_pkgs;
@@ -119,7 +119,9 @@ L<FS::part_pkg>.
 sub pkgpart_hashref {
   my $self = shift;
   my %pkgpart;
-  $pkgpart{$_}++ foreach $self->pkgpart;
+  #$pkgpart{$_}++ foreach $self->pkgpart;
+  # not compatible w/5.004_04 (fixed in 5.004_05)
+  foreach ( $self->pkgpart ) { $pkgpart{$_}++; }
   \%pkgpart;
 }
 
@@ -164,13 +166,7 @@ agent type.
 
 sub pkgpart {
   my $self = shift;
-
-  #map $_->pkgpart, $self->type_pkgs;
-
-  my $sql = 'SELECT pkgpart FROM type_pkgs WHERE typenum = ?';
-  my $sth = dbh->prepare($sql)    or die  dbh->errstr;
-  $sth->execute( $self->typenum ) or die $sth->errstr;
-  map $_->[0], @{ $sth->fetchall_arrayref };
+  map $_->pkgpart, $self->type_pkgs;
 }
 
 =back