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

(-)a/C4/Items.pm (-1 / +11 lines)
Lines 2650-2655 sub PrepareItemrecordDisplay { Link Here
2650
                    && $defaultvalues
2650
                    && $defaultvalues
2651
                    && $defaultvalues->{'callnumber'} ) {
2651
                    && $defaultvalues->{'callnumber'} ) {
2652
                    if( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ){
2652
                    if( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ){
2653
                        # if the item record exists, only use default value if the item has no callnumber
2654
                        $defaultvalue = $defaultvalues->{callnumber};
2655
                    } elsif ( !$itemrecord and $defaultvalues ) {
2656
                        # if the item record *doesn't* exists, always use the default value
2653
                        $defaultvalue = $defaultvalues->{callnumber};
2657
                        $defaultvalue = $defaultvalues->{callnumber};
2654
                    }
2658
                    }
2655
                }
2659
                }
Lines 2665-2670 sub PrepareItemrecordDisplay { Link Here
2665
                    && $defaultvalues->{'location'} ) {
2669
                    && $defaultvalues->{'location'} ) {
2666
2670
2667
                    if ( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ) {
2671
                    if ( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ) {
2672
                        # if the item record exists, only use default value if the item has no locationr
2673
                        $defaultvalue = $defaultvalues->{location};
2674
                    } elsif ( !$itemrecord and $defaultvalues ) {
2675
                        # if the item record *doesn't* exists, always use the default value
2668
                        $defaultvalue = $defaultvalues->{location};
2676
                        $defaultvalue = $defaultvalues->{location};
2669
                    }
2677
                    }
2670
                }
2678
                }
Lines 2695-2700 sub PrepareItemrecordDisplay { Link Here
2695
                                $authorised_lib{$branchcode} = $branchname;
2703
                                $authorised_lib{$branchcode} = $branchname;
2696
                            }
2704
                            }
2697
                        }
2705
                        }
2706
                        $defaultvalue = $defaultvalues->{branchcode} || C4::Context->userenv->{branch};
2698
2707
2699
                        #----- itemtypes
2708
                        #----- itemtypes
2700
                    } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
2709
                    } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
Lines 2720-2725 sub PrepareItemrecordDisplay { Link Here
2720
                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
2729
                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
2721
                        }
2730
                        }
2722
2731
2732
                        $defaultvalue = $default_source;
2733
2723
                        #---- "true" authorised value
2734
                        #---- "true" authorised value
2724
                    } else {
2735
                    } else {
2725
                        $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} );
2736
                        $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} );
2726
- 

Return to bug 9902