diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 1bea9f1aaf..8e77ea9c3b 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -134,17 +134,20 @@ sub buildKohaItemsNamespace { my @items = C4::Items::GetItemsInfo($biblionumber); my $branches = GetBranches(); my $itemtypes = GetItemTypes(); + my $xml; for my $item (@items) { my $status; + my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber}); - if ( $item->{notforloan} == -1 || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || + + if ( $itemtypes->{ $item->{itype} }->{notforloan} == 1 || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || ($transfertwhen ne '') || $item->{itemnotforloan} ) { if ( $item->{notforloan} == -1) { $status = "On order"; } - if ( $item->{itemnotforloan} ) { - $status = "Not for loan"; + if ( $item->{itemnotforloan} > 0 || $item->{notforloan} > 0 || $itemtypes->{ $item->{itype} }->{notforloan} == 1 ) { + $status = "reference"; } if ($item->{onloan}) { $status = "Checked out"; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index cade5d2e5f..9fd857f980 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -325,7 +325,7 @@ -
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 45a9780fd9..1446b643fd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -266,9 +266,9 @@ - Not for loan + Not for loan () - Not for loan + Not for loan () Checked out diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 4cb2421d97..feeff9932b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -833,11 +833,11 @@ - No copies available + No copies available - Copies available at: + Copies available for loan: @@ -850,6 +850,25 @@ + + + + + Copies available for reference: + + + + [] + ( + + ) + . , + + + + + Checked out (