diff options
| author | ivan <ivan> | 2008-11-26 00:20:30 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-11-26 00:20:30 +0000 |
| commit | cb3519647ad9a022e14e596e28a5a5eed6afae49 (patch) | |
| tree | 0aa457e2815de6623f582fb99edaacb53f0b2d28 | |
| parent | 49d4fb98b700725f2ecf249b3f1e368d236e38e2 (diff) | |
should fix importing from excel, closes: RT#4337
| -rw-r--r-- | FS/FS/Record.pm | 6 | ||||
| -rw-r--r-- | FS/FS/cust_main/Import.pm | 2 |
2 files changed, 5 insertions, 3 deletions
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}; |