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

(-)a/C4/Items.pm (-2 / +11 lines)
Lines 2656-2661 sub PrepareItemrecordDisplay { Link Here
2656
                    && $defaultvalues
2656
                    && $defaultvalues
2657
                    && $defaultvalues->{'callnumber'} ) {
2657
                    && $defaultvalues->{'callnumber'} ) {
2658
                    if( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ){
2658
                    if( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ){
2659
                        # if the item record exists, only use default value if the item has no callnumber
2660
                        $defaultvalue = $defaultvalues->{callnumber};
2661
                    } elsif ( !$itemrecord and $defaultvalues ) {
2662
                        # if the item record *doesn't* exists, always use the default value
2659
                        $defaultvalue = $defaultvalues->{callnumber};
2663
                        $defaultvalue = $defaultvalues->{callnumber};
2660
                    }
2664
                    }
2661
                }
2665
                }
Lines 2671-2676 sub PrepareItemrecordDisplay { Link Here
2671
                    && $defaultvalues->{'location'} ) {
2675
                    && $defaultvalues->{'location'} ) {
2672
2676
2673
                    if ( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ) {
2677
                    if ( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ) {
2678
                        # if the item record exists, only use default value if the item has no locationr
2679
                        $defaultvalue = $defaultvalues->{location};
2680
                    } elsif ( !$itemrecord and $defaultvalues ) {
2681
                        # if the item record *doesn't* exists, always use the default value
2674
                        $defaultvalue = $defaultvalues->{location};
2682
                        $defaultvalue = $defaultvalues->{location};
2675
                    }
2683
                    }
2676
                }
2684
                }
Lines 2701-2707 sub PrepareItemrecordDisplay { Link Here
2701
                                $authorised_lib{$branchcode} = $branchname;
2709
                                $authorised_lib{$branchcode} = $branchname;
2702
                            }
2710
                            }
2703
                        }
2711
                        }
2704
                        $defaultvalue = C4::Context->userenv->{branch};
2712
                        $defaultvalue = $defaultvalues->{branchcode} || C4::Context->userenv->{branch};
2705
2713
2706
                        #----- itemtypes
2714
                        #----- itemtypes
2707
                    } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
2715
                    } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
Lines 2727-2732 sub PrepareItemrecordDisplay { Link Here
2727
                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
2735
                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
2728
                        }
2736
                        }
2729
2737
2738
                        $defaultvalue = $default_source;
2739
2730
                        #---- "true" authorised value
2740
                        #---- "true" authorised value
2731
                    } else {
2741
                    } else {
2732
                        $authorised_values_sth->execute(
2742
                        $authorised_values_sth->execute(
2733
- 

Return to bug 9902