[Koha-cvs] CVS: koha/members memberentry.pl,1.8,1.9

[Paul POULAIN]

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21182/members

Modified Files:
        memberentry.pl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** memberentry.pl      7 Mar 2005 08:55:31 -0000       1.8
--- memberentry.pl      4 May 2005 09:01:58 -0000       1.9
***************
*** 53,57 ****
                             });
  
! my $member=$input->param('bornum');
  my $actionType=$input->param('actionType') || '';
  my $modify=$input->param('modify');
--- 53,57 ----
                             });
  
! my $borrowernumber=$input->param('borrowernumber');
  my $actionType=$input->param('actionType') || '';
  my $modify=$input->param('modify');
***************
*** 101,105 ****
                $nok=1;
        }
!       if ($data{'address'} eq ''){
                push @errors, "ERROR_address";
                $nok=1;
--- 101,105 ----
                $nok=1;
        }
!       if ($data{'streetaddress'} eq ''){
                push @errors, "ERROR_address";
                $nok=1;
***************
*** 121,125 ****
                        &modmember(%data);
                }else{
!                       $data{borrowernumber} = &newmember(%data);
                }
                
--- 121,131 ----
                        &modmember(%data);
                }else{
!                       $borrowernumber = &newmember(%data);
!               }
!               
!       if($destination eq "circ"){
!               print 
$input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
!       } else {
!               print 
$input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
                }
                
***************
*** 132,136 ****
  }
  if ($delete){
!       print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member");
  } else {  # this else goes down the whole script
        if ($actionType eq 'Add'){
--- 138,142 ----
  }
  if ($delete){
!       print 
$input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
  } else {  # this else goes down the whole script
        if ($actionType eq 'Add'){
***************
*** 147,151 ****
                }
        } else {
!               $data=borrdata('',$member);
        }
        if ($actionType eq 'Add'){
--- 153,157 ----
                }
        } else {
!               $data=borrdata('',$borrowernumber);
        }
        if ($actionType eq 'Add'){
***************
*** 244,248 ****
                                ethcatpopup     => $ethcatpopup,
                                catcodepopup    => $catcodepopup,
!                               streetaddress   => $data->{'physstreet'},
                                zipcode => $data->{'zipcode'},
                                streetcity      => $data->{'streetcity'},
--- 250,255 ----
                                ethcatpopup     => $ethcatpopup,
                                catcodepopup    => $catcodepopup,
!                               streetaddress   => $data->{'streetaddress'},
!                               physstreet   => $data->{'physstreet'},
                                zipcode => $data->{'zipcode'},
                                streetcity      => $data->{'streetcity'},