-# Barcode entry box, with hidden inputs attached....
-my $barcodeentrytext = << "EOF";
-<form method=post action=/cgi-bin/koha/circ/returns.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage>
-<font color=black><b>Enter Book Barcode</b></font></td></tr>
-<tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
-</table>
-$ritext
-</form>
-EOF
-
-
-if ($messages->{'ResFound'}) {
- my $res = $messages->{'ResFound'};
- my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
- my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
- my $name = $borr->{'surname'}." ".$borr->{'title'}." ".$borr->{'firstname'};
- my $number = "<a href=/cgi-bin/koha/moremember.pl?bornum=$borr->{'borrowernumber'} onClick='openWindow(this,'Member', 480, 640)'>$borr->{'cardnumber'}</a>";
- my ($iteminfo) = getiteminformation(\%env, 0, $barcode);
-
- if ($res->{'ResFound'} eq "Waiting") {
- $reservetext = <<"EOF";
-<font color='red' size='+2'>Item marked Waiting:</font><br>
- Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
-is marked waiting at <b>$branchname</b> for $name ($number).
-<center><form method=post action='returns.pl'>
-$ritext
-<input type=hidden name=barcode value=0>
-<input type=submit value="OK">
-</form></center>
-EOF
- }
- if ($res->{'ResFound'} eq "Reserved") {
- my @da = localtime(time());
- my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
- my $slip = <<"EOF";
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: $todaysdate;
-
-ITEM RESERVED:
-$iteminfo->{'title'} ($iteminfo->{'author'})
-barcode: $iteminfo->{'barcode'}
-
-COLLECT AT: $branchname
-
-BORROWER:
-$borr->{'surname'}, $borr->{'firstname'}
-card number: $borr->{'cardnumber'}
-Phone: $borr->{'phone'}
-$borr->{'streetaddress'}
-$borr->{'suburb'}
-$borr->{'town'}
-$borr->{'emailaddress'}
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-EOF
-
- $reservetext = <<"EOF";
-<font color='red' size='+2'>Reserved found:</font> Item: $iteminfo->{'title'} ($iteminfo->{'author'}) <br>
-for $name ($number).
-<table cellpadding=5 cellspacing=0>
-<tr><td valign="top">Change status to waiting and print
-<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
-<td valign="top">
-<form method=post action='returns.pl'>
-$ritext
-<input type=hidden name=itemnumber value=$res->{'itemnumber'}>
-<input type=hidden name=borrowernumber value=$res->{'borrowernumber'}>
-<input type=hidden name=resbarcode value=$barcode>
-<input type=hidden name=resslip value="$slip">
-<input type=submit value="Print">
-</form>
-</td></tr>
-</table>
-EOF
- }
+if ( $messages->{'NeedsTransfer'} ){
+ $template->param(
+ found => 1,
+ needstransfer => 1,
+ itemnumber => $itemnumber,
+ );
+}
+
+if ( $messages->{'Wrongbranch'} ){
+ $template->param(
+ wrongbranch => 1,
+ );
+}
+
+# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
+
+if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
+ $template->param(
+ WrongTransfer => 1,
+ TransferWaitingAt => $messages->{'WrongTransfer'},
+ WrongTransferItem => $messages->{'WrongTransferItem'},
+ );
+
+ my $reserve = $messages->{'ResFound'};
+ my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
+ my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
+ my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
+ $template->param(
+ wname => $name,
+ wborfirstname => $borr->{'firstname'},
+ wborsurname => $borr->{'surname'},
+ wbortitle => $borr->{'title'},
+ wborphone => $borr->{'phone'},
+ wboremail => $borr->{'email'},
+ wboraddress => $borr->{'address'},
+ wboraddress2 => $borr->{'address2'},
+ wborcity => $borr->{'city'},
+ wborzip => $borr->{'zipcode'},
+ wborrowernumber => $reserve->{'borrowernumber'},
+ wborcnum => $borr->{'cardnumber'},
+ wtransfertFrom => $userenv_branch,
+ );