projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
49d4fb9
)
should fix importing from excel, closes: RT#4337
author
ivan
<ivan>
Wed, 26 Nov 2008 00:20:30 +0000
(
00:20
+0000)
committer
ivan
<ivan>
Wed, 26 Nov 2008 00:20:30 +0000
(
00:20
+0000)
FS/FS/Record.pm
patch
|
blob
|
history
FS/FS/cust_main/Import.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
022f7cd
..
4b6684d
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-1388,7
+1388,8
@@
sub batch_import {
eval "use Spreadsheet::ParseExcel;";
die $@ if $@;
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};
$parser = $excel->{Worksheet}[0]; #first sheet
$count = $parser->{MaxRow} || $parser->{MinRow};
@@
-1430,7
+1431,8
@@
sub batch_import {
} elsif ( $type eq 'xls' ) {
} 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;
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
a955d24
..
519540f
100644
(file)
--- 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 $@;
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};
$parser = $excel->{Worksheet}[0]; #first sheet
$count = $parser->{MaxRow} || $parser->{MinRow};