Bug 15774: Show additional field values in edit form

[koha.git] / serials / routing-preview.pl

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 73d89df..7ddbfe5 100755 (executable)
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -16,10 +16,9 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 # Routing Preview.pl script used to view a routing list after creation
-# lets one print out routing slip and create (in this instance) the heirarchy
+# lets one print out routing slip and create (in this instance) the hierarchy
 # of reserves for the serial
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Koha;
 use C4::Auth;
@@ -63,13 +62,13 @@ my $subs = GetSubscription($subscriptionid);
 my ($tmp ,@serials) = GetSerials($subscriptionid);
 my ($template, $loggedinuser, $cookie);
 
+my $library;
 if($ok){
     # get biblio information....
-    my $biblionumber = $subs->{'biblionumber'};
-    my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblionumber);
-       my @itemresults = GetItemsInfo( $subs->{biblionumber} );
-       my $branch = $itemresults[0]->{'holdingbranch'};
-    my $branchname = Koha::Libraries->find($branch)->branchname;
+    my $biblionumber = $subs->{'bibnum'};
+    my @itemresults = GetItemsInfo( $biblionumber );
+    my $branch = @itemresults ? $itemresults[0]->{'holdingbranch'} : $subs->{branchcode};
+    $library = Koha::Libraries->find($branch);
 
        if (C4::Context->preference('RoutingListAddReserves')){
                # get existing reserves .....
@@ -95,7 +94,7 @@ if($ok){
                     branchcode     => $branch
                 });
             } else {
-                AddReserve($branch,$routing->{borrowernumber},$biblionumber,\@bibitems,$routing->{ranking}, undef, undef, $notes,$title);
+                AddReserve($branch,$routing->{borrowernumber},$biblionumber,undef,$routing->{ranking}, undef, undef, $notes,$title);
         }
     }
        }
@@ -108,7 +107,6 @@ if($ok){
                                flagsrequired => {serials => '*'},
                                debug => 1,
                                });
-    $template->param("libraryname"=>$branchname);
 } else {
     ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/routing-preview.tt",
@@ -120,6 +118,8 @@ if($ok){
                                });
 }
 
+$template->param( libraryname => $library->branchname ) if $library;
+
 my $memberloop = [];
 for my $routing (@routinglist) {
     my $member = Koha::Patrons->find( $routing->{borrowernumber} )->unblessed;
@@ -137,7 +137,6 @@ $template->param(
     subscriptionid => $subscriptionid,
     memberloop => $memberloop,
     routingnotes => $routingnotes,
-    generalroutingnote => C4::Context->preference('RoutingListNote'),
     hasRouting => check_routing($subscriptionid),
     (uc(C4::Context->preference("marcflavour"))) => 1
     );