X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg.pm;h=6525864c480b39f48fd3f8ed992327545d2542e4;hb=1116af6d9150abdf8e0438f45c78b357ab8820a6;hp=99d88d56a927258402ea6ab4b068c973c31cae0f;hpb=789c34c5251f4b831a7cb27bd2a9af700ccf2ced;p=freeside.git

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 99d88d56a..6525864c4 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -180,6 +180,8 @@ insert and replace methods.
 sub check {
   my $self = shift;
 
+  for (qw(setup recur)) { $self->set($_=>0) if $self->get($_) =~ /^\s*$/; }
+
   my $conf = new FS::Conf;
   if ( $conf->exists('safe-part_pkg') ) {
 
@@ -265,11 +267,12 @@ SVCDB is specified and does not match the svcdb of the service definition,
 
 sub svcpart {
   my $self = shift;
-  my $svcdb = shift;
-  my @pkg_svc = $self->pkg_svc;
-  return '' if scalar(@pkg_svc) != 1
-               || $pkg_svc[0]->quantity != 1
-               || ( $svcdb && $pkg_svc[0]->part_svc->svcdb ne $svcdb );
+  my $svcdb = scalar(@_) ? shift : '';
+  my @pkg_svc = grep {
+    $_->quantity == 1
+    && ( $svcdb eq $_->part_svc->svcdb || !$svcdb )
+  } $self->pkg_svc;
+  return '' if scalar(@pkg_svc) != 1;
   $pkg_svc[0]->svcpart;
 }