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

(-)a/circ/returns.pl (-3 / +5 lines)
Lines 598-607 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
598
        $ri{barcode}             = $bar_code;
598
        $ri{barcode}             = $bar_code;
599
        $ri{homebranch}          = $item->homebranch;
599
        $ri{homebranch}          = $item->homebranch;
600
        $ri{holdingbranch}       = $item->holdingbranch;
600
        $ri{holdingbranch}       = $item->holdingbranch;
601
        $ri{location}            = $item->location;
602
        $ri{permlocation}        = $item->permanent_location;
601
603
602
        $ri{location} = $item->location;
603
        my $shelfcode = $ri{'location'};
604
        my $shelfcode = $ri{'location'};
604
        $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
605
        my $permshelfcode = $ri{'permlocation'};
606
        $ri{'location'} = ( $shelflocations->{$permshelfcode} ne '' ) ? $shelflocations->{$permshelfcode} : ( $permshelfcode ) ? $permshelfcode : undef;
607
        $ri{'location'} .= ( ( $shelflocations->{$shelfcode} ne '' ) && ( $shelfcode ne $permshelfcode ) ) ? ' (' . $shelflocations->{$shelfcode} . ')' : ( ( $shelfcode ) && ( $shelfcode ne $permshelfcode ) ) ? ' (' . $shelfcode . ')' : undef;
605
608
606
    }
609
    }
607
    else {
610
    else {
608
- 

Return to bug 21444