[Koha-cvs] CVS: koha modrequest.pl,1.4,1.5 request.pl,1.24,1.25

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv15778

Modified Files:
	modrequest.pl request.pl 
Log Message:
fix for #387

Index: modrequest.pl
===================================================================
RCS file: /cvsroot/koha/koha/modrequest.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** modrequest.pl	22 Apr 2003 08:39:04 -0000	1.4
--- modrequest.pl	15 May 2003 13:56:52 -0000	1.5
***************
*** 45,49 ****
  for (my $i=0;$i<$count;$i++){
      UpdateReserve($rank[$i],$biblio[$i],$borrower[$i],$branch[$i]); #from C4::Reserves2
-       print "updating reserve";
  }
  
--- 45,48 ----

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** request.pl	8 May 2003 13:19:40 -0000	1.24
--- request.pl	15 May 2003 13:56:52 -0000	1.25
***************
*** 64,86 ****
  }
  
- 
- # get branch information
- my $branch = $input->cookie('branch');
- ($branch) || ($branch = 'L');
- my $branches = getbranches();
- # make branch selection options...
- my @branchloop;
- foreach my $br (keys %$branches) {
- #	(next) unless $branches->{$br}->{'IS'};
- #			# Only branches with the 'IS' branchrelation
- #			# can issue books
- 	my %abranch;
- 	$abranch{'selected'}=($br eq $branch);
- 	$abranch{'branch'}=$br;
- 	$abranch{'branchname'}=$branches->{$br}->{'branchname'};
- 	push(@branchloop,\%abranch);
- }
- 
- 
  # todays date
  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =localtime(time);
--- 64,67 ----
***************
*** 125,128 ****
--- 106,110 ----
  #existingreserves building
  my @reserveloop;
+ my $branches = getbranches();
  foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
  	my %reserve;
***************
*** 135,150 ****
  		push(@optionloop, \%option);
  	}
! #    my $bropt = branchoptions($res->{'branchcode'});
! #	my @branchloop;
! #	foreach my $br (keys %$branches) {
! #		(next) unless $branches->{$br}->{'IS'};
! #				# Only branches with the 'IS' branchrelation
! #				# can issue books
! #		my %abranch;
! #		$abranch{'selected'}=($br eq $res->{'branchcode'});
! #		$abranch{'branch'}=$br;
! #		$abranch{'branchname'}=$branches->{$br}->{'branchname'};
! #		push(@branchloop,\%abranch);
! #	}
  
      if ($res->{'found'} eq 'W') {
--- 117,131 ----
  		push(@optionloop, \%option);
  	}
! 	my @branchloop;
! 	foreach my $br (keys %$branches) {
! # 		(next) unless $branches->{$br}->{'IS'};
! 				# Only branches with the 'IS' branchrelation
! 				# can issue books
! 		my %abranch;
! 		$abranch{'selected'}=($br eq $res->{'branchcode'});
! 		$abranch{'branch'}=$br;
! 		$abranch{'branchname'}=$branches->{$br}->{'branchname'};
! 		push(@branchloop,\%abranch);
! 	}
  
      if ($res->{'found'} eq 'W') {