X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=request.pl;h=1f28e766d5fd3886f487835efac306b94f993a2d;hb=0d1f848afa3b616317555fe507148526221f605c;hp=fc2f914384dbe01550722fada79d21a7aec31d6c;hpb=54b726844d96209ae0616980ba9c19044753d1cd;p=koha.git

diff --git a/request.pl b/request.pl
index fc2f914384..1f28e766d5 100755
--- a/request.pl
+++ b/request.pl
@@ -26,13 +26,14 @@
 use strict;
 use C4::Search;
 use C4::Output;
+use C4::Interface::CGI::Output;
 use C4::Auth;
 use C4::Reserves2;
 use C4::Biblio;
 use C4::Koha;
 use C4::Circulation::Circ2;
 use HTML::Template;
-use C4::Catalogue;
+use C4::Acquisition;
 use CGI;
 use C4::Date;
 
@@ -63,30 +64,11 @@ for (my $i=1; $i<=$num; $i++){
 	push(@optionloop, \%option);
 }
 
-
-# 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);
 $year=$year+1900;
 $mon++;
-my $date="$mday/$mon/$year";
+my $date=format_date("$year-$mon-$mday");
 
 
 # get biblioitem information and build rows for form
@@ -124,6 +106,7 @@ foreach my $dat (sort {$b->{'dateaccessioned'} cmp $a->{'dateaccessioned'}} @dat
 
 #existingreserves building
 my @reserveloop;
+my $branches = getbranches();
 foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
 	my %reserve;
 #    my $prioropt = priorityoptions($totalcount, $res->{'priority'});
@@ -134,18 +117,17 @@ foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
 		$option{selected}=($i==$res->{'priority'});
 		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);
-#	}
+	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') {
 		my %env;
@@ -161,6 +143,7 @@ foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
 	$reserve{'biblionumber'}=$res->{'biblionumber'};
 	$reserve{'bornum'}=$res->{'borrowernumber'};
 	$reserve{'firstname'}=$res->{'firstname'};
+	$reserve{'surname'}=$res->{'surname'};
 	$reserve{'bornum'}=$res->{'borrowernumber'};
 	$reserve{'notes'}=$res->{'reservenotes'};
 	$reserve{'wait'}=($res->{'found'} eq 'W');
@@ -207,4 +190,7 @@ $template->param(	optionloop =>\@optionloop,
 								bib => $bib,
 								title =>$dat->{title});
 # printout the page
-print $input->header(-expires=>'now'), $template->output;
+print $input->header(
+	-type => C4::Interface::CGI::Output::guesstype($template->output),
+	-expires=>'now'
+), $template->output;