(bug #3353) permit librarians to cancel orders

[koha.git] / opac / opac-MARCdetail.pl

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index a1ecb99..51d1579 100755 (executable)
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -40,7 +40,6 @@ the items attached to the biblio
 =cut
 
 use strict;
-require Exporter;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
@@ -75,6 +74,9 @@ $template->param(
     bibliotitle => $biblio->{title},
 );
 
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
+
 # adding the $RequestOnOpac param
 my $RequestOnOpac;
 if (C4::Context->preference("RequestOnOpac")) {
@@ -128,7 +130,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
         }
         else {
             my @subf = $fields[$x_i]->subfields;
-
+            my $previous;
             # loop through each subfield
             for my $i ( 0 .. $#subf ) {
                 $subf[$i][0] = "@" unless $subf[$i][0];
@@ -140,7 +142,10 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                   if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{hidden} > 0 ); 
                 my %subfield_data;
                 $subfield_data{marc_lib} =
-                  $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
+                                ($tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib} eq $previous) ?
+                                '--' :
+                                $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
+                $previous = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
                 $subfield_data{link} =
                   $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{link};
                 $subf[$i][1] =~ s/\n/<br\/>/g;
@@ -155,7 +160,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                 {
 
 #                    warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
-                    $subfield_data{marc_value} = DisplayISBN( $subf[$i][1] );
+                    $subfield_data{marc_value} = $subf[$i][1];
                 }
                 else {
                     if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
@@ -231,7 +236,7 @@ foreach my $field (@fields) {
         elsif ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq
             "biblioitems.isbn" )
         {
-            $this_row{ $subf[$i][0] } = DisplayISBN( $subf[$i][1] );
+            $this_row{ $subf[$i][0] } = $subf[$i][1];
         }
         else {
             $this_row{ $subf[$i][0] } =