summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-07-12 17:31:33 -0700
committerMark Wells <mark@freeside.biz>2016-07-12 17:31:33 -0700
commita1c150b4ab4f726591210331dd7eb850900d741e (patch)
tree35a618a21d71c1771e81aa51e35736a1b18df6a4
parent7773547423c9cd0e8ac7915de58daacbec7ccf09 (diff)
restore location labels on invoices, but remove the 'default service location' prefix from everywhere, #71474
-rw-r--r--FS/FS/Template_Mixin.pm4
-rw-r--r--FS/FS/cust_location.pm9
2 files changed, 8 insertions, 5 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index b197c6ce2..efe9769fe 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3396,7 +3396,7 @@ sub _items_cust_bill_pkg {
# 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);
@@ -3506,7 +3506,7 @@ sub _items_cust_bill_pkg {
# 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);
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index cbb4565b7..4960f746f 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -716,9 +716,12 @@ sub label_prefix {
} 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;