@@ -, +, @@
while inserting patrons
---
C4/Members.pm | 2 ++
.../prog/en/modules/tools/import_borrowers.tt | 2 +-
tools/import_borrowers.pl | 18 ++++++++++--------
3 files changed, 13 insertions(+), 9 deletions(-)
--- a/C4/Members.pm
+++ a/C4/Members.pm
@@ -631,6 +631,8 @@ sub ModMember {
borrowernumber => $new_borrower->{borrowernumber},
});
+ delete $new_borrower->{userid} if exists $new_borrower->{userid} and not $new_borrower->{userid};
+
my $execute_success = $rs->update($new_borrower);
if ($execute_success ne '0E0') { # only proceed if the update was a success
# If the patron changes to a category with enrollment fee, we add a fee
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -92,7 +92,7 @@
[% END %]
[% IF ERROR.duplicate_userid %]
- Userid [% ERROR.userid %] is already used by another patron or is empty.
+ Userid [% ERROR.userid %] is already used by another patron.
[% END %]
[% END %]
--- a/tools/import_borrowers.pl
+++ a/tools/import_borrowers.pl
@@ -253,14 +253,6 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
next;
}
- # generate a proper login if none provided
- if ( $borrower{userid} eq '' || !Check_Userid( $borrower{userid} ) ) {
- push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
- $invalid++;
- next LINE;
- }
-
-
if ($borrowernumber) {
# borrower exists
unless ($overwrite_cardnumber) {
@@ -280,6 +272,16 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
$borrower{$col} = $member->{$col} if($member->{$col}) ;
}
}
+
+ # Check if the userid provided does not exist yet
+ if ( exists $borrower{userid}
+ and $borrower{userid}
+ and not Check_Userid( $borrower{userid}, $borrower{borrowernumber} ) ) {
+ push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
+ $invalid++;
+ next LINE;
+ }
+
unless (ModMember(%borrower)) {
$invalid++;
# until we have better error trapping, we have no way of knowing why ModMember errored out...
--