# location, and we're not grouping items by location already
if ( $cust_pkg->locationnum != $default_locationnum
and !defined($locationnum) ) {
- my $loc = $cust_pkg->location_label(no_prefix => 1);
+ my $loc = $cust_pkg->location_label;
$loc = substr($loc, 0, $maxlength). '...'
if $format eq 'latex' && length($loc) > $maxlength;
push @d, &{$escape_function}($loc);
# location, and we're not grouping items by location already
if ( $cust_pkg->locationnum != $default_locationnum
and !defined($locationnum) ) {
- my $loc = $cust_pkg->location_label(no_prefix => 1);
+ my $loc = $cust_pkg->location_label;
$loc = substr($loc, 0, $maxlength). '...'
if $format eq 'latex' && length($loc) > $maxlength;
push @d, &{$escape_function}($loc);
} elsif ( $label_prefix eq '_location' && $self->locationname ) {
$prefix = $self->locationname;
- } elsif ( ( $opt{'cust_main'} || $self->custnum )
- && $self->locationnum == $cust_or_prospect->ship_locationnum ) {
- $prefix = 'Default service location';
+ #} elsif ( ( $opt{'cust_main'} || $self->custnum )
+ # && $self->locationnum == $cust_or_prospect->ship_locationnum ) {
+ # $prefix = 'Default service location';
+ #}
+ } else {
+ $prefix = '';
}
$prefix;