better error msg on CSV import with bad pkgpart
authorivan <ivan>
Sat, 7 Oct 2006 21:40:58 +0000 (21:40 +0000)
committerivan <ivan>
Sat, 7 Oct 2006 21:40:58 +0000 (21:40 +0000)
FS/FS/cust_main.pm

index cb44ba6..95ed7de 100644 (file)
@@ -4473,7 +4473,12 @@ sub batch_import {
 
       my @svc_acct = ();
       if ( $svc_acct{'username'} ) {
-        $svc_acct{svcpart} = $cust_pkg->part_pkg->svcpart( 'svc_acct' );
+        my $part_pkg = $cust_pkg->part_pkg;
+       unless ( $part_pkg ) {
+         $dbh->rollback if $oldAutoCommit;
+         return "unknown pkgnum ". $cust_pkg{'pkgpart'};
+       } 
+        $svc_acct{svcpart} = $part_pkg->svcpart( 'svc_acct' );
         push @svc_acct, new FS::svc_acct ( \%svc_acct )
       }