Bug 19214: Prevent crash if ->club or ->patron is called in list context

[koha.git] / circ / transferstoreceive.pl

diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 20f14d1..0929ed3 100755 (executable)
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -35,9 +35,12 @@ use Date::Calc qw(
 
 use C4::Koha;
 use C4::Reserves;
+use Koha::Items;
+use Koha::ItemTypes;
 use Koha::Libraries;
 use Koha::DateUtils;
 use Koha::BiblioFrameworks;
+use Koha::Patrons;
 
 my $input = new CGI;
 my $itemnumber = $input->param('itemnumber');
@@ -87,27 +90,38 @@ while ( my $library = $libraries->next ) {
                 $getransf{'messcompa'} = 1;
                                $getransf{'diff'} = $diff;
             }
-            my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
-            my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $gettitle->{'itype'} : $gettitle->{'itemtype'} );
 
-            $getransf{'datetransfer'} = $num->{'datesent'};
-            $getransf{'itemtype'} = $itemtypeinfo ->{'description'};
-                       foreach (qw(title author biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
-               $getransf{$_} = $gettitle->{$_};
-                       }
+            my $item = Koha::Items->find( $num->{itemnumber} );
+            my $biblio = $item->biblio;
+            my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype );
 
-            my $record = GetMarcBiblio($gettitle->{'biblionumber'});
-            $getransf{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($gettitle->{'biblionumber'}));
+            $getransf{'datetransfer'} = $num->{'datesent'};
+            $getransf{'itemtype'} = $itemtype->description; # FIXME Should not it be translated_description?
+            %getransf = (
+                %getransf,
+                title          => $biblio->title,
+                author         => $biblio->author,
+                biblionumber   => $biblio->biblionumber,
+                itemnumber     => $item->itemnumber,
+                barcode        => $item->barcode,
+                homebranch     => $item->homebranch,
+                holdingbranch  => $item->holdingbranch,
+                itemcallnumber => $item->itemcallnumber,
+            );
+
+            my $record = GetMarcBiblio({ biblionumber => $biblio->biblionumber });
+            $getransf{'subtitle'} = GetRecordValue('subtitle', $record, $biblio->frameworkcode);
 
             # we check if we have a reserv for this transfer
-            my @checkreserv = GetReservesFromItemnumber($num->{'itemnumber'});
-            if ( $checkreserv[0] ) {
-                my $getborrower = C4::Members::GetMember( borrowernumber => $checkreserv[1] );
-                $getransf{'borrowernum'}       = $getborrower->{'borrowernumber'};
-                $getransf{'borrowername'}      = $getborrower->{'surname'};
-                $getransf{'borrowerfirstname'} = $getborrower->{'firstname'};
-                $getransf{'borrowermail'}      = $getborrower->{'email'} if $getborrower->{'email'};
-                $getransf{'borrowerphone'}     = $getborrower->{'phone'};
+            my $holds = $item->current_holds;
+            if ( my $first_hold = $holds->next ) {
+                my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
+                # FIXME The full patron object should be passed to the template
+                $getransf{'borrowernum'}       = $patron->borrowernumber;
+                $getransf{'borrowername'}      = $patron->surname;
+                $getransf{'borrowerfirstname'} = $patron->firstname;
+                $getransf{'borrowermail'}      = $patron->email if $patron->email;
+                $getransf{'borrowerphone'}     = $patron->phone;
             }
             push( @transferloop, \%getransf );
         }