X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FImport.pm;h=f477323d1bfdfe2eff3630311ec346c9cbb16dcc;hb=e17848681a50a13f13b4eb8d70d368289e431673;hp=4f377b9b471309a276f1d28da726f33eb1a3b1ef;hpb=54d73dfad0b27edd10ec7c917a96c88d45ad6789;p=freeside.git

diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index 4f377b9b4..f477323d1 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -8,10 +8,12 @@ use MIME::Base64;
 use Date::Parse;
 use File::Slurp qw( slurp );
 use FS::UID qw( dbh );
+use FS::Record qw( qsearchs );
 use FS::cust_main;
 use FS::svc_acct;
 use FS::svc_external;
 use FS::svc_phone;
+use FS::part_referral;
 
 $DEBUG = 0;
 
@@ -190,7 +192,7 @@ sub batch_import {
     eval "use Spreadsheet::ParseExcel;";
     die $@ if $@;
 
-    my $excel = new Spreadsheet::ParseExcel::Workbook->Parse($filename);
+    my $excel = Spreadsheet::ParseExcel::Workbook->new->Parse($filename);
     $parser = $excel->{Worksheet}[0]; #first sheet
 
     $count = $parser->{MaxRow} || $parser->{MinRow};
@@ -232,7 +234,8 @@ sub batch_import {
 
     } elsif ( $type eq 'xls' ) {
 
-      last if $row > ($parser->{MaxRow} || $parser->{MinRow});
+      last if $row > ($parser->{MaxRow} || $parser->{MinRow})
+           || ! $parser->{Cells}[$row];
 
       my @row = @{ $parser->{Cells}[$row] };
       @columns = map $_->{Val}, @row;
@@ -355,7 +358,6 @@ sub batch_import {
           push @svc_x, $class->new( \%svc_x );
         }
         if ( $svc_phone ) {
-          warn $part_pkg->svcpart_unique_svcdb('svc_phone');
           $svc_phone->svcpart( $part_pkg->svcpart_unique_svcdb('svc_phone') );
           push @svc_x, $svc_phone;
         }