From: MJ Ray <mjr@phonecoop.coop>
Date: Tue, 5 May 2009 15:52:47 +0000 (+0100)
Subject: Allow autogenerated cardnumbers again to solve http://bugs.koha.org/cgi-bin/bugzilla3... 
X-Git-Tag: v3.00.02-stable~57
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1bb6b10032c4b6469ca89f0895dab6a3e470b945;p=koha.git

Allow autogenerated cardnumbers again to solve bugs.koha.org/cgi-bin/bugzilla3/show_bug.cgi?id=2287

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---

diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 662dfccfcf..9ac994bc75 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -129,7 +129,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
 
     push @feedback, {feedback=>1, name=>'headerrow', value=>join(', ', @csvcolumns)};
     my $today_iso = C4::Dates->new()->output('iso');
-    my @criticals = qw(cardnumber surname categorycode);    # there probably should be others
+    my @criticals = qw(surname branchcode categorycode);    # there probably should be others
     my @bad_dates;  # I've had a few.
     my $date_re = C4::Dates->new->regexp('syspref');
     my  $iso_re = C4::Dates->new->regexp('iso');
@@ -206,7 +206,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
 	$borrower{dateexpiry} = GetExpiryDate($borrower{categorycode},$borrower{dateenrolled}) unless $borrower{dateexpiry}; 
         my $borrowernumber;
         my $member;
-        if ($matchpoint eq 'cardnumber') {
+        if ( ($matchpoint eq 'cardnumber') && ($borrower{'cardnumber'}) ) {
             $member = GetMember( $borrower{'cardnumber'}, 'cardnumber' );
             if ($member) {
                 $borrowernumber = $member->{'borrowernumber'};