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

(-)a/C4/Members.pm (+5 lines)
Lines 750-755 Returns as undef upon any db error without further processing Link Here
750
sub AddMember {
750
sub AddMember {
751
    my (%data) = @_;
751
    my (%data) = @_;
752
    my $dbh = C4::Context->dbh;
752
    my $dbh = C4::Context->dbh;
753
    if(C4::Context->preference("autoMemberNum")) {
754
        if ($data{'cardnumber'} eq '') {
755
               $data{'cardnumber'}= fixup_cardnumber($data{'cardnumber'},C4::Context->userenv->{'branch'}, $data{'categorycode'});
756
        }
757
    }
753
	# generate a proper login if none provided
758
	# generate a proper login if none provided
754
	$data{'userid'} = Generate_Userid($data{'borrowernumber'}, $data{'firstname'}, $data{'surname'}) if $data{'userid'} eq '';
759
	$data{'userid'} = Generate_Userid($data{'borrowernumber'}, $data{'firstname'}, $data{'surname'}) if $data{'userid'} eq '';
755
	# create a disabled account if no password provided
760
	# create a disabled account if no password provided
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-2 / +6 lines)
Lines 1006-1013 Link Here
1006
      <label for="cardnumber" class="required">
1006
      <label for="cardnumber" class="required">
1007
    [% ELSE %]
1007
    [% ELSE %]
1008
      <label for="cardnumber">
1008
      <label for="cardnumber">
1009
    [% END %] 
1009
    [% END %]
1010
    Card number: </label>
1010
    [% IF ( autoMemberNum ) %]
1011
      Card number<br>(<u>leave blank for auto calc during registration</u>): </label>
1012
    [% ELSE %]
1013
       Card number: </label>
1014
     [% END %]
1011
    [% IF ( opduplicate ) %]
1015
    [% IF ( opduplicate ) %]
1012
		<input type="text" id="cardnumber" name="cardnumber" size="20" />
1016
		<input type="text" id="cardnumber" name="cardnumber" size="20" />
1013
    [% ELSE %]
1017
    [% ELSE %]
(-)a/members/memberentry.pl (-2 / +5 lines)
Lines 433-439 if ( $op eq "duplicate" ) { Link Here
433
    $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
433
    $template->param( step_1 => 1, step_2 => 1, step_3 => 1, step_4 => 1, step_5 => 1, step_6 => 1 ) unless $step;
434
}
434
}
435
435
436
$data{'cardnumber'}=fixup_cardnumber($data{'cardnumber'}) if $op eq 'add';
436
if (C4::Context->preference("autoMemberNum")) {
437
    $template->param( autoMemberNum => 1);
438
} else {
439
    $template->param( autoMemberNum => 0);
440
}
437
if(!defined($data{'sex'})){
441
if(!defined($data{'sex'})){
438
    $template->param( none => 1);
442
    $template->param( none => 1);
439
} elsif($data{'sex'} eq 'F'){
443
} elsif($data{'sex'} eq 'F'){
440
- 

Return to bug 6782