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

[Paul POULAIN]

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/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.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** memberentry.pl	4 May 2005 09:01:58 -0000	1.9
--- memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
***************
*** 129,138 ****
  		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
  		}
- 		
- 	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=$data{'borrowernumber'}");
- 		}
  	}
  }
--- 129,132 ----
***************
*** 242,246 ****
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				member          => $member,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
--- 236,240 ----
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				borrowernumber          => $borrowernumber,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
***************
*** 268,273 ****
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				dateenrolled	=> $data->{'dateenrolled'},
! 				expiry		=> $data->{'expiry'},
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
--- 262,267 ----
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				joining	=> format_date($data->{'dateenrolled'}),
! 				expiry		=> format_date($data->{'expiry'}),
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},