From: ivan <ivan>
Date: Wed, 26 Nov 2008 00:20:30 +0000 (+0000)
Subject: should fix importing from excel, closes: RT#4337
X-Git-Tag: root_of_webpay_support~228
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=cb3519647ad9a022e14e596e28a5a5eed6afae49

should fix importing from excel, closes: RT#4337
---

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 022f7cdfb..4b6684d8e 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1388,7 +1388,8 @@ 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};
@@ -1430,7 +1431,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;
diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index a955d2433..519540fd4 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -190,7 +190,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};