Merge branch 'bug_10026' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-04-23 08:44:07 -04:00
commit 061b38fe84

View file

@ -78,6 +78,7 @@ foreach my $biblionumber ( @bibs ) {
$hasauthors = 1; $hasauthors = 1;
} }
my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'}, 'opac'); my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'}, 'opac');
my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'}, 'opac');
# COinS format FIXME: for books Only # COinS format FIXME: for books Only
my $coins_format; my $coins_format;
@ -92,6 +93,9 @@ foreach my $biblionumber ( @bibs ) {
my $branches = GetBranches(); my $branches = GetBranches();
for my $itm (@items) { for my $itm (@items) {
if ($itm->{'location'}){
$itm->{'location_opac'} = $shelflocations->{$itm->{'location'} };
}
my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber}); my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber});
if ( defined( $transfertwhen ) && $transfertwhen ne '' ) { if ( defined( $transfertwhen ) && $transfertwhen ne '' ) {
$itm->{transfertwhen} = $transfertwhen; $itm->{transfertwhen} = $transfertwhen;