Bug 18177: remove aqbooksellers.booksellerurl

[srvgit] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index a9e2bc2..456d0d1 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -35,6 +35,9 @@ use CGI qw ( -utf8 );
 use DateTime;
 
 use C4::Auth qw/:DEFAULT get_session/;
+use C4::Output;
+use C4::Circulation;
+use C4::Reserves;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Context;
@@ -43,7 +46,6 @@ use C4::Koha;   # FIXME : is it still useful ?
 use C4::Members::Messaging;
 use C4::Members;
 use C4::Output;
-use C4::Print;
 use C4::Reserves;
 use C4::RotatingCollections;
 use Koha::AuthorisedValues;
@@ -70,11 +72,6 @@ my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
 
 my $sessionID = $query->cookie("CGISESSID");
 my $session = get_session($sessionID);
-if ($session->param('branch') eq 'NO_LIBRARY_SET'){
-    # no branch set we can't return
-    print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
-    exit;
-}
 
 # Print a reserve slip on this page
 if ( $query->param('print_slip') ) {
@@ -88,16 +85,11 @@ if ( $query->param('print_slip') ) {
 
 #####################
 #Global vars
-my $printers = GetPrinters();
 my $userenv = C4::Context->userenv;
 my $userenv_branch = $userenv->{'branch'} // '';
-my $printer = $userenv->{'branchprinter'} // '';
 my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire');
 
 my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
- #
-# Some code to handle the error if there is no branch or printer setting.....
-#
 
 # Set up the item stack ....
 my %returneditems;
@@ -237,7 +229,8 @@ if ($dotransfer){
 # An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer
     my $transferitem = $query->param('transferitem');
     my $tobranch     = $query->param('tobranch');
-    ModItemTransfer($transferitem, $userenv_branch, $tobranch);
+    my $trigger      = $query->param('trigger');
+    ModItemTransfer($transferitem, $userenv_branch, $tobranch, $trigger);
 }
 
 if ($canceltransfer){
@@ -376,6 +369,7 @@ if ( $messages->{'NeedsTransfer'} ){
     $template->param(
         found          => 1,
         needstransfer  => $messages->{'NeedsTransfer'},
+        trigger        => $messages->{'TransferTrigger'},
         itemnumber     => $itemnumber,
     );
 }
@@ -624,7 +618,6 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
 
 $template->param(
     riloop         => \@riloop,
-    printer        => $printer,
     errmsgloop     => \@errmsgloop,
     exemptfine     => $exemptfine,
     dropboxmode    => $dropboxmode,