[Koha-cvs] CVS: koha/members memberentry.pl,1.5.2.6,1.5.2.7 member.pl,1.2.2.4,1.2.2.5

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_2
	memberentry.pl member.pl 
Log Message:
* adding column branch to the result list when searching a borrower
* fixing a bug that prevented to add a borrower when IndependantBranches was ON

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -r1.5.2.6 -r1.5.2.7
*** memberentry.pl	26 Aug 2005 12:21:50 -0000	1.5.2.6
--- memberentry.pl	9 Sep 2005 09:09:25 -0000	1.5.2.7
***************
*** 160,164 ****
  	if (C4::Context->preference("IndependantBranches")) {
  		my $userenv = C4::Context->userenv;
! 		if ($userenv->{flags} != 1){
  			unless ($userenv->{branch} eq $data->{'branchcode'}){
  				print $input->redirect("/cgi-bin/koha/members/members-home.pl");
--- 160,164 ----
  	if (C4::Context->preference("IndependantBranches")) {
  		my $userenv = C4::Context->userenv;
! 		if ($userenv->{flags} != 1 && $data->{branchcode}){
  			unless ($userenv->{branch} eq $data->{'branchcode'}){
  				print $input->redirect("/cgi-bin/koha/members/members-home.pl");

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** member.pl	28 Jun 2005 10:21:29 -0000	1.2.2.4
--- member.pl	9 Sep 2005 09:09:25 -0000	1.2.2.5
***************
*** 98,101 ****
--- 98,102 ----
          streetaddress => $results->[$i]{'streetaddress'},
          city => $results->[$i]{'city'},
+         branchcode => $results->[$i]{'branchcode'},
          odissue => "$od/$issue",
          fines => $fines,