@@ -, +, @@ --- serials/routing-preview.pl | 45 ++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 19 deletions(-) --- a/serials/routing-preview.pl +++ a/serials/routing-preview.pl @@ -66,41 +66,48 @@ if($ok){ my $biblio = Koha::Biblios->find( $biblionumber ); my $branchcode = $subs->{branchcode}; my $serialitem = Koha::Serial::Items->search( { serialid => $serialid } )->next; - if ( $serialitem ) { + + if ( C4::Context->preference('RoutingListAddReserves') && $serialitem ) { my $item = Koha::Items->find($serialitem->itemnumber); $branchcode = $item->holdingbranch || $branchcode; - } - $library = Koha::Libraries->find($branchcode); - - if (C4::Context->preference('RoutingListAddReserves')){ - my $notes; - my $title = $subs->{'bibliotitle'}; - for my $routing ( @routinglist ) { - my $sth = $dbh->prepare('SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1'); - $sth->execute($biblionumber,$routing->{borrowernumber}); + $library = Koha::Libraries->find($branchcode); + + my $notes; + my $title = $subs->{'bibliotitle'}; + for my $routing (@routinglist) { + my $sth = $dbh->prepare( + 'SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1' + ); + $sth->execute( $biblionumber, $routing->{borrowernumber} ); my $reserve = $sth->fetchrow_hashref; - if($routing->{borrowernumber} == $reserve->{borrowernumber}){ - ModReserve({ - rank => $routing->{ranking}, - biblionumber => $biblionumber, - borrowernumber => $routing->{borrowernumber}, - branchcode => $branchcode, - }); - } else { + if ( $routing->{borrowernumber} == $reserve->{borrowernumber} ) + { + ModReserve( + { + rank => $routing->{ranking}, + biblionumber => $biblionumber, + itemnumber => $serialitem->itemnumber, + borrowernumber => $routing->{borrowernumber}, + branchcode => $branchcode, + } + ); + } + else { AddReserve( { branchcode => $branchcode, borrowernumber => $routing->{borrowernumber}, biblionumber => $biblionumber, + itemnumber => $serialitem->itemnumber, priority => $routing->{ranking}, notes => $notes, title => $title, } ); + } } } - } ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/routing-preview-slip.tt", --