Merge branch 'bug_10230' into 3.14-master

[koha.git] / tools / viewlog.pl

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index d689217..e48aaef 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2010 BibLibre
+# Copyright 2011 MJ Ray and software.coop
 #
 # This file is part of Koha.
 #
@@ -73,14 +74,17 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
     my $data = GetMember('borrowernumber'=>$borrowernumber);
     my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
     $template->param( picture => 1 ) if $picture;
+    
     $template->param(   menu            => 1,
                         title           => $data->{'title'},
                         initials        => $data->{'initials'},
                         surname         => $data->{'surname'},
+                        othernames      => $data->{'othernames'},
                         borrowernumber  => $borrowernumber,
                         firstname       => $data->{'firstname'},
                         cardnumber      => $data->{'cardnumber'},
                         categorycode    => $data->{'categorycode'},
+                        category_type   => $data->{'category_type'},
                         categoryname   => $data->{'description'},
                         address         => $data->{'address'},
                         address2        => $data->{'address2'},
@@ -92,20 +96,22 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
                         email           => $data->{'email'},
                         branchcode      => $data->{'branchcode'},
                         branchname             => GetBranchName($data->{'branchcode'}),
+                        RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
 }
 
 $template->param(
-       DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-                     dateformat => C4::Dates->new()->format(),
-                                      debug => $debug,
-       C4::Search::enabled_staff_search_views,
+    debug => $debug,
+    C4::Search::enabled_staff_search_views,
 );
 
 if ($do_it) {
 
     my @data;
-    my $results = GetLogs($datefrom,$dateto,$user,\@modules,\@action,$object,$info);
+    my ($results,$modules,$action);
+    if ($action[0] ne '') { $action = \@action; } # match All means no limit
+    if ($modules[0] ne '') { $modules = \@modules; } # match All means no limit
+    $results = GetLogs($datefrom,$dateto,$user,$modules,$action,$object,$info);
     @data=@$results;
     my $total = scalar @data;
     foreach my $result (@data){
@@ -116,6 +122,7 @@ if ($do_it) {
            my $item=GetItem($itemnumber);
            $result->{'biblionumber'}=$item->{'biblionumber'};
            $result->{'biblioitemnumber'}=$item->{'biblionumber'};              
+        $result->{'barcode'}=$item->{'barcode'};
        }
     }