View | Details | Raw Unified | Return to bug 2655
Collapse All | Expand All

(-)a/C4/XSLT.pm (-2 / +8 lines)
Lines 26-31 use C4::Items; Link Here
26
use C4::Koha;
26
use C4::Koha;
27
use C4::Biblio;
27
use C4::Biblio;
28
use C4::Circulation;
28
use C4::Circulation;
29
use C4::Reserves;
29
use Encode;
30
use Encode;
30
use XML::LibXML;
31
use XML::LibXML;
31
use XML::LibXSLT;
32
use XML::LibXSLT;
Lines 173-180 sub buildKohaItemsNamespace { Link Here
173
174
174
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
175
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
175
176
176
        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} ||
177
	my ( $reservestatus, $reserveitem ) = C4::Reserves::CheckReserves($item->{itemnumber});
177
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} ) {
178
179
        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
180
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
178
            if ( $item->{notforloan} < 0) {
181
            if ( $item->{notforloan} < 0) {
179
                $status = "On order";
182
                $status = "On order";
180
            } 
183
            } 
Lines 196-201 sub buildKohaItemsNamespace { Link Here
196
            if (defined $transfertwhen && $transfertwhen ne '') {
199
            if (defined $transfertwhen && $transfertwhen ne '') {
197
                $status = 'In transit';
200
                $status = 'In transit';
198
            }
201
            }
202
            if (defined $reservestatus && $reservestatus eq "Waiting") {
203
                $status = 'Waiting';
204
            }
199
        } else {
205
        } else {
200
            $status = "available";
206
            $status = "available";
201
        }
207
        }
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (+6 lines)
Lines 1010-1015 Link Here
1010
                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
1010
                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
1011
                       <xsl:text>). </xsl:text>                   </span>
1011
                       <xsl:text>). </xsl:text>                   </span>
1012
                   </xsl:if>
1012
                   </xsl:if>
1013
                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
1014
                   <span class="unavailable">
1015
                       <xsl:text>On hold (</xsl:text>
1016
                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
1017
                       <xsl:text>). </xsl:text>                   </span>
1018
                   </xsl:if>
1013
               </span>
1019
               </span>
1014
    </xsl:template>
1020
    </xsl:template>
1015
1021
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl (-1 / +7 lines)
Lines 189-194 Link Here
189
        <xsl:text>). </xsl:text>
189
        <xsl:text>). </xsl:text>
190
      </span>
190
      </span>
191
    </xsl:if>
191
    </xsl:if>
192
    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
193
      <span class="unavailable">
194
        <xsl:text>On hold (</xsl:text>
195
        <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
196
        <xsl:text>). </xsl:text>
197
      </span>
198
    </xsl:if>
192
  </span>
199
  </span>
193
200
194
</xsl:template>
201
</xsl:template>
195
- 

Return to bug 2655