bug 2473: correct display of items.content

[koha_fer] / opac / opac-detail.pl

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 7c98fea..05114d3 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -28,6 +28,7 @@ use C4::Serials;    #uses getsubscriptionfrom biblionumber
 use C4::Output;
 use C4::Biblio;
 use C4::Items;
+use C4::Circulation;
 use C4::Tags qw(get_tags);
 use C4::Dates qw/format_date/;
 use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn get_biblio_from_xisbn);
@@ -120,14 +121,17 @@ if (C4::Context->preference("RequestOnOpac")) {
 my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber ) );
 
 my $norequests = 1;
+my $branches = GetBranches();
 my %itemfields;
 for my $itm (@items) {
      $norequests = 0 && $norequests
        if ( (not $itm->{'wthdrawn'} )
-         || (not $itm->{'itemlost'} )
-         || (not $itm->{'itemnotforloan'} )
-         || ($itm->{'itemnumber'} ) );
-        $itm->{ $itm->{'publictype'} } = 1;
+         && (not $itm->{'itemlost'} )
+         && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} )
+                && (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
+         && ($itm->{'itemnumber'} ) );
+
+    $itm->{ $itm->{'publictype'} } = 1;
     $itm->{datedue} = format_date($itm->{datedue});
     $itm->{datelastseen} = format_date($itm->{datelastseen});
 
@@ -140,6 +144,7 @@ for my $itm (@items) {
        $itemfields{ccode} = 1 if($itm->{ccode});
        $itemfields{enumchron} = 1 if($itm->{enumchron});
        $itemfields{copynumber} = 1 if($itm->{copynumber});
+       $itemfields{itemnotes} = 1 if($itm->{itemnotes});
 
      # walk through the item-level authorised values and populate some images
      my $item_authorised_value_images = C4::Items::get_authorised_value_images( C4::Items::get_item_authorised_values( $itm->{'itemnumber'} ) );
@@ -151,6 +156,13 @@ for my $itm (@items) {
          $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' };
      }
 
+    
+     my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
+     if ( $transfertwhen ne '' ) {
+        $itm->{transfertwhen} = format_date($transfertwhen);
+        $itm->{transfertfrom} = $branches->{$transfertfrom}{branchname};
+        $itm->{transfertto}   = $branches->{$transfertto}{branchname};
+     }
 }
 
 ## get notes and subjects from MARC record
@@ -175,6 +187,7 @@ my $subtitle         = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 's
                      itemdata_ccode          => $itemfields{ccode},
                      itemdata_enumchron      => $itemfields{enumchron},
                      itemdata_copynumber     => $itemfields{copynumber},
+                     itemdata_itemnotes          => $itemfields{itemnotes},
                      authorised_value_images => $biblio_authorised_value_images,
                      subtitle                => $subtitle,
     );
@@ -289,7 +302,6 @@ $template->param( OpenOPACShelfBrowser => 1) if $starting_itemnumber;
 my ($starting_cn_sort, $starting_homebranch, $starting_location);
 my $sth_get_cn_sort = $dbh->prepare("SELECT cn_sort,homebranch,location from items where itemnumber=?");
 $sth_get_cn_sort->execute($starting_itemnumber);
-my $branches = GetBranches();
 while (my $result = $sth_get_cn_sort->fetchrow_hashref()) {
     $starting_cn_sort = $result->{'cn_sort'};
     $starting_homebranch->{code} = $result->{'homebranch'};