From d95afe65f1b4939d22ea27af9c531faff3e7ccd3 Mon Sep 17 00:00:00 2001 From: simith Date: Mon, 3 Nov 2014 09:06:40 -0500 Subject: [PATCH] camelot 778 lbo_RM5001_Bordereau / BZ11882 fix --- circ/circulation.pl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index dc41405..88a0ccc 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -380,6 +380,13 @@ if ($barcode) { my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber); $template->param( issuecount => $issue ); + + if ($question->{RESERVE_WAITING} or $question->{RESERVED}){ + $template->param( + reserveborrowernumber => $question->{'resborrowernumber'}, + itembiblionumber => $getmessageiteminfo->{'biblionumber'} + ); + } } # reload the borrower info for the sake of reseting the flags..... @@ -554,17 +561,6 @@ my $relatives_issues_count = Koha::Database->new()->schema()->resultset('Issue') ->count( { borrowernumber => \@relatives } ); -(my $returned, my $messages) = AddReturn( $barcode, $branch); -if ( $messages->{'ResFound'}) { - my $reserve = $messages->{'ResFound'}; - # get biblio description - my $biblio = GetBiblioFromItemNumber($reserve->{'itemnumber'}); - $template->param( - reserveborrowernumber => $reserve->{'borrowernumber'}, - itembiblionumber => $biblio->{'biblionumber'} - ); -} - $template->param( lib_messages_loop => $lib_messages_loop, bor_messages_loop => $bor_messages_loop, -- 1.9.1