Bug 16950: Serials subscriptions advanced search shows '0 found' pre-search

[srvgit] / circ / branchtransfers.pl

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index ad7aa9a..5ed99b9 100755 (executable)
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -7,29 +7,28 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Circulation;
 use C4::Output;
 use C4::Reserves;
 use C4::Biblio;
 use C4::Items;
 use C4::Auth qw/:DEFAULT get_session/;
-use C4::Branch; # GetBranches
 use C4::Koha;
 use C4::Members;
 
@@ -53,7 +52,7 @@ if (!C4::Context->userenv){
 # Make the page .....
 my ($template, $user, $cookie) = get_template_and_user(
     {
-        template_name   => "circ/branchtransfers.tmpl",
+        template_name   => "circ/branchtransfers.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -61,8 +60,6 @@ my ($template, $user, $cookie) = get_template_and_user(
     }
 );
 
-my $branches = GetBranches;
-
 my $messages;
 my $found;
 my $reserved;
@@ -80,7 +77,10 @@ my $ignoreRs = 0;
 # Deal with the requests....
 if ( $request eq "KillWaiting" ) {
     my $item = $query->param('itemnumber');
-    CancelReserve( 0, $item, $borrowernumber );
+    CancelReserve({
+        itemnumber     => $item,
+        borrowernumber => $borrowernumber
+    });
     $cancelled   = 1;
     $reqmessage  = 1;
 }
@@ -93,18 +93,20 @@ elsif ( $request eq "SetWaiting" ) {
 }
 elsif ( $request eq 'KillReserved' ) {
     my $biblio = $query->param('biblionumber');
-    CancelReserve( $biblio, 0, $borrowernumber );
+    CancelReserve({
+        biblionumber   => $biblio,
+        borrowernumber => $borrowernumber
+    });
     $cancelled   = 1;
     $reqmessage  = 1;
 }
 
 # collect the stack of books already transfered so they can printed...
 my @trsfitemloop;
-my %transfereditems;
 my $transfered;
 my $barcode = $query->param('barcode');
-# strip whitespace
-defined $barcode and $barcode =~ s/\s*//g;  # FIXME: barcodeInputFilter
+# remove leading/trailing whitespace
+defined $barcode and $barcode =~ s/^\s*|\s*$//g;  # FIXME: barcodeInputFilter
 # warn "barcode : $barcode";
 if ($barcode) {
 
@@ -126,8 +128,6 @@ if ($barcode) {
         $item{'ccode'}                 = $iteminformation->{'ccode'};
         $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
         $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
-        $item{'frbrname'}              = $branches->{$frbranchcd}->{'branchname'};
-        $item{'tobrname'}              = $branches->{$tobranchcd}->{'branchname'};
 #         }
         $item{counter}  = 0;
         $item{barcode}  = $barcode;
@@ -159,8 +159,6 @@ foreach ( $query->param ) {
     $item{'ccode'}                 = $iteminformation->{'ccode'};
     $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
     $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
-    $item{'frbrname'}              = $branches->{$frbcd}->{'branchname'};
-    $item{'tobrname'}              = $branches->{$tobcd}->{'branchname'};
     push( @trsfitemloop, \%item );
 }
 
@@ -182,15 +180,6 @@ if ($found) {
     }
 }
 
-#####################
-
-# Used for branch transfer limits error messages.
-my $codeTypeDescription = 'Collection Code';
-my $codeType = C4::Context->preference("BranchTransferLimitsType");
-if ( $codeType eq 'itemtype' ) {   
-    $codeTypeDescription = 'Item Type';
-}
-
 my @errmsgloop;
 foreach my $code ( keys %$messages ) {
     if ( $code ne 'WasTransfered' ) {
@@ -200,17 +189,16 @@ foreach my $code ( keys %$messages ) {
             $err{errbadcode} = 1;
         }
         elsif ( $code eq "NotAllowed" ) {
-            warn "NotAllowed: $messages->{'NotAllowed'} to  " . $branches->{ $messages->{'NotAllowed'} }->{'branchname'};
+            warn "NotAllowed: $messages->{'NotAllowed'} to branchcode " . $messages->{'NotAllowed'};
             # Do we really want a error log message here? --atz
             $err{errnotallowed} =  1;
             my ( $tbr, $typecode ) = split( /::/,  $messages->{'NotAllowed'} );
-            $err{tbr}      = $branches->{ $tbr }->{'branchname'};
+            $err{tbr}      = $tbr;
             $err{code}     = $typecode;
-            $err{codeType} = $codeTypeDescription;
         }
         elsif ( $code eq 'IsPermanent' ) {
             $err{errispermanent} = 1;
-            $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
+            $err{msg} = $messages->{'IsPermanent'};
         }
         elsif ( $code eq 'WasReturned' ) {
             $err{errwasreturned} = 1;
@@ -241,7 +229,6 @@ $template->param(
     cancelled               => $cancelled,
     setwaiting              => $setwaiting,
     trsfitemloop            => \@trsfitemloop,
-    branchoptionloop        => GetBranchesLoop($tobranchcd),
     errmsgloop              => \@errmsgloop,
     CircAutocompl           => C4::Context->preference("CircAutocompl")
 );