View | Details | Raw Unified | Return to bug 16426
Collapse All | Expand All

(-)a/C4/Members.pm (+2 lines)
Lines 631-636 sub ModMember { Link Here
631
        borrowernumber => $new_borrower->{borrowernumber},
631
        borrowernumber => $new_borrower->{borrowernumber},
632
     });
632
     });
633
633
634
    delete $new_borrower->{userid} if exists $new_borrower->{userid} and not $new_borrower->{userid};
635
634
    my $execute_success = $rs->update($new_borrower);
636
    my $execute_success = $rs->update($new_borrower);
635
    if ($execute_success ne '0E0') { # only proceed if the update was a success
637
    if ($execute_success ne '0E0') { # only proceed if the update was a success
636
        # If the patron changes to a category with enrollment fee, we add a fee
638
        # 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 (-1 / +1 lines)
Lines 92-98 Link Here
92
        [% END %]
92
        [% END %]
93
        [% IF ERROR.duplicate_userid %]
93
        [% IF ERROR.duplicate_userid %]
94
            <li class="line_error">
94
            <li class="line_error">
95
                Userid [% ERROR.userid %] is already used by another patron or is empty.
95
                Userid [% ERROR.userid %] is already used by another patron.
96
            </li>
96
            </li>
97
        [% END %]
97
        [% END %]
98
    [% END %]
98
    [% END %]
(-)a/tools/import_borrowers.pl (-9 / +10 lines)
Lines 253-266 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
253
            next;
253
            next;
254
        }
254
        }
255
255
256
        # generate a proper login if none provided
257
        if ( $borrower{userid} eq '' || !Check_Userid( $borrower{userid} ) ) {
258
            push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
259
            $invalid++;
260
            next LINE;
261
        }
262
263
264
        if ($borrowernumber) {
256
        if ($borrowernumber) {
265
            # borrower exists
257
            # borrower exists
266
            unless ($overwrite_cardnumber) {
258
            unless ($overwrite_cardnumber) {
Lines 280-285 if ( $uploadborrowers && length($uploadborrowers) > 0 ) { Link Here
280
                    $borrower{$col} = $member->{$col} if($member->{$col}) ;
272
                    $borrower{$col} = $member->{$col} if($member->{$col}) ;
281
                }
273
                }
282
            }
274
            }
275
276
            # Check if the userid provided does not exist yet
277
            if (  exists $borrower{userid}
278
                     and $borrower{userid}
279
                 and not Check_Userid( $borrower{userid}, $borrower{borrowernumber} ) ) {
280
                push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
281
                $invalid++;
282
                next LINE;
283
            }
284
283
            unless (ModMember(%borrower)) {
285
            unless (ModMember(%borrower)) {
284
                $invalid++;
286
                $invalid++;
285
                # until we have better error trapping, we have no way of knowing why ModMember errored out...
287
                # until we have better error trapping, we have no way of knowing why ModMember errored out...
286
- 

Return to bug 16426