Merge remote branch 'kc/new/bug_5879' into kcmaster

This commit is contained in:
Chris Cormack 2011-03-18 10:38:56 +13:00
commit b61afbee79
1 changed files with 9 additions and 1 deletions

View File

@ -755,7 +755,7 @@ sub GetISBDView {
my ( $holdingbrtagf, $holdingbrtagsubf ) = &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
my $tagslib = &GetMarcStructure( 1, $itemtype );
my $ISBD = C4::Context->preference('ISBD');
my $ISBD = C4::Context->preference('isbd');
my $bloc = $ISBD;
my $res;
my $blocres;
@ -2289,6 +2289,14 @@ sub PrepareItemrecordDisplay {
$defaultvalue = $defaultvalues->{branchcode} if $defaultvalues;
}
}
if ( ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.location' )
&& $defaultvalues
&& $defaultvalues->{'location'} ) {
my $temp = $itemrecord->field($subfield) if ($itemrecord);
unless ($temp) {
$defaultvalue = $defaultvalues->{location} if $defaultvalues;
}
}
if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
my @authorised_values;
my %authorised_lib;