|
Lines 2244-2253
sub effective_location {
Link Here
|
| 2244 |
my ($self) = @_; |
2244 |
my ($self) = @_; |
| 2245 |
|
2245 |
|
| 2246 |
if ( my $display = $self->active_display ) { |
2246 |
if ( my $display = $self->active_display ) { |
| 2247 |
return $display->display_location |
2247 |
return $display->display_location || "Display: " . $display->display_name; |
| 2248 |
if ( $display->display_location ); |
|
|
| 2249 |
|
| 2250 |
return "DISPLAY: " . $display->display_name; |
| 2251 |
} |
2248 |
} |
| 2252 |
|
2249 |
|
| 2253 |
return $self->location; |
2250 |
return $self->location; |
|
Lines 2266-2272
sub effective_collection_code {
Link Here
|
| 2266 |
my ($self) = @_; |
2263 |
my ($self) = @_; |
| 2267 |
|
2264 |
|
| 2268 |
if ( my $display = $self->active_display ) { |
2265 |
if ( my $display = $self->active_display ) { |
| 2269 |
return $display->display_code; |
2266 |
return $display->display_code || $self->ccode; |
| 2270 |
} |
2267 |
} |
| 2271 |
|
2268 |
|
| 2272 |
return $self->ccode; |
2269 |
return $self->ccode; |
|
Lines 2303-2309
sub effective_homebranch {
Link Here
|
| 2303 |
my ($self) = @_; |
2300 |
my ($self) = @_; |
| 2304 |
|
2301 |
|
| 2305 |
if ( my $display = $self->active_display ) { |
2302 |
if ( my $display = $self->active_display ) { |
| 2306 |
return $display->get_column('display_branch'); |
2303 |
return $display->get_column('display_branch') || $self->homebranch; |
| 2307 |
} |
2304 |
} |
| 2308 |
|
2305 |
|
| 2309 |
return $self->get_column('homebranch'); |
2306 |
return $self->get_column('homebranch'); |
|
Lines 2340-2346
sub effective_holdingbranch {
Link Here
|
| 2340 |
my ($self) = @_; |
2337 |
my ($self) = @_; |
| 2341 |
|
2338 |
|
| 2342 |
if ( my $display = $self->active_display ) { |
2339 |
if ( my $display = $self->active_display ) { |
| 2343 |
return $display->get_column('display_holding_branch'); |
2340 |
return $display->get_column('display_holding_branch') || $self->holdingbranch; |
| 2344 |
} |
2341 |
} |
| 2345 |
|
2342 |
|
| 2346 |
return $self->get_column('holdingbranch'); |
2343 |
return $self->get_column('holdingbranch'); |
| 2347 |
- |
|
|