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

(-)a/C4/Search.pm (-1 / +11 lines)
Lines 2146-2151 sub searchResults { Link Here
2146
                # is item on the reserve shelf?
2146
                # is item on the reserve shelf?
2147
                my $reservestatus = '';
2147
                my $reservestatus = '';
2148
2148
2149
                # is item a waiting recall?
2150
                my $recallstatus = '';
2151
2149
                unless ($item->{withdrawn}
2152
                unless ($item->{withdrawn}
2150
                        || $item->{itemlost}
2153
                        || $item->{itemlost}
2151
                        || $item->{damaged}
2154
                        || $item->{damaged}
Lines 2167-2172 sub searchResults { Link Here
2167
                    #
2170
                    #
2168
                    ($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
2171
                    ($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
2169
                    $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
2172
                    $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
2173
                    $recallstatus = Koha::Recalls->find({ itemnumber => $itemnumber->{itemnumber}, status => 'W' });
2170
                }
2174
                }
2171
2175
2172
                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
2176
                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
Lines 2175-2187 sub searchResults { Link Here
2175
                    || $item->{damaged}
2179
                    || $item->{damaged}
2176
                    || $item->{notforloan}
2180
                    || $item->{notforloan}
2177
                    || $reservestatus eq 'Waiting'
2181
                    || $reservestatus eq 'Waiting'
2182
                    || (defined $recallstatus)
2178
                    || ($transfertwhen ne ''))
2183
                    || ($transfertwhen ne ''))
2179
                {
2184
                {
2180
                    $withdrawn_count++        if $item->{withdrawn};
2185
                    $withdrawn_count++        if $item->{withdrawn};
2181
                    $itemlost_count++        if $item->{itemlost};
2186
                    $itemlost_count++        if $item->{itemlost};
2182
                    $itemdamaged_count++     if $item->{damaged};
2187
                    $itemdamaged_count++     if $item->{damaged};
2183
                    $item_in_transit_count++ if $transfertwhen ne '';
2188
                    $item_in_transit_count++ if $transfertwhen ne '';
2184
                    $item_onhold_count++     if $reservestatus eq 'Waiting';
2189
                    $item_onhold_count++     if (($reservestatus eq 'Waiting') || (defined $recallstatus));
2185
                    $item->{status} = $item->{withdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
2190
                    $item->{status} = $item->{withdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
2186
2191
2187
                    # can place a hold on a item if
2192
                    # can place a hold on a item if
Lines 2204-2209 sub searchResults { Link Here
2204
                    }
2209
                    }
2205
                    $other_items->{$key}->{intransit} = ( $transfertwhen ne '' ) ? 1 : 0;
2210
                    $other_items->{$key}->{intransit} = ( $transfertwhen ne '' ) ? 1 : 0;
2206
                    $other_items->{$key}->{onhold} = ($reservestatus) ? 1 : 0;
2211
                    $other_items->{$key}->{onhold} = ($reservestatus) ? 1 : 0;
2212
                    if (defined $recallstatus) {
2213
                        $recallstatus = 'W';
2214
                    }
2215
                    $other_items->{$key}->{onhold} = ($recallstatus) ? 1 : 0;
2216
2207
                    $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value and $item->{notforloan};
2217
                    $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value and $item->{notforloan};
2208
					$other_items->{$key}->{count}++ if $item->{$hbranch};
2218
					$other_items->{$key}->{count}++ if $item->{$hbranch};
2209
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
2219
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
(-)a/C4/XSLT.pm (-1 / +2 lines)
Lines 291-296 sub buildKohaItemsNamespace { Link Here
291
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
291
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
292
292
293
        my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
293
        my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
294
        my $recallstatus = Koha::Recalls->find({ itemnumber => $item->{itemnumber}, status => 'W'});
294
295
295
        if ( ( $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} ) || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} ||
296
        if ( ( $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} ) || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} ||
296
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
297
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
Lines 315-321 sub buildKohaItemsNamespace { Link Here
315
            if (defined $transfertwhen && $transfertwhen ne '') {
316
            if (defined $transfertwhen && $transfertwhen ne '') {
316
                $status = 'In transit';
317
                $status = 'In transit';
317
            }
318
            }
318
            if (defined $reservestatus && $reservestatus eq "Waiting") {
319
            if ((defined $reservestatus && $reservestatus eq "Waiting") || (defined $recallstatus)) {
319
                $status = 'Waiting';
320
                $status = 'Waiting';
320
            }
321
            }
321
        } else {
322
        } else {
(-)a/opac/opac-detail.pl (-2 / +2 lines)
Lines 694-700 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here
694
    }
694
    }
695
695
696
     my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber});
696
     my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber});
697
      if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; }
697
     my $waiting_recall_status = Koha::Recalls->find({ itemnumber => $itm->{itemnumber}, status => 'W' });
698
     if( $reserve_status eq "Waiting" || defined($waiting_recall_status) ){ $itm->{'waiting'} = 1; }
698
      if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; }
699
      if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; }
699
    
700
    
700
     my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
701
     my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
701
- 

Return to bug 19532