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

[Paul POULAIN]

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

Modified Files:
	memberentry.pl member.pl 
Log Message:
porting 22 fixes to head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** memberentry.pl	4 Aug 2005 14:14:48 -0000	1.15
--- memberentry.pl	9 Sep 2005 10:04:55 -0000	1.16
***************
*** 159,162 ****
--- 159,170 ----
  		$data=borrdata('',$borrowernumber);
  	}
+ 	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");
+ 			}
+ 		}
+ 	}
  	if ($actionType eq 'Add'){
  		$template->param( updtype => 'I');

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** member.pl	4 Aug 2005 14:14:52 -0000	1.8
--- member.pl	9 Sep 2005 10:04:55 -0000	1.9
***************
*** 98,101 ****
--- 98,102 ----
          streetaddress => $results->[$i]{'streetaddress'},
          city => $results->[$i]{'city'},
+         branchcode => $results->[$i]{'branchcode'},
          odissue => "$od/$issue",
          fines => $fines,