summaryrefslogtreecommitdiff
path: root/FS/FS/Template_Mixin.pm
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:47 -0700
commit92aeca588c2e42aae2d50dc0d6b1115c4e4a768d (patch)
treec1dc539f0cfa373c4b63210556abfadc34bab475 /FS/FS/Template_Mixin.pm
parent6f5ea058941c0acb13b02c86287c54974bd3d59f (diff)
restore location labels on invoices, but remove the 'default service location' prefix from everywhere, #71474
Diffstat (limited to 'FS/FS/Template_Mixin.pm')
-rw-r--r--FS/FS/Template_Mixin.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 2355529..c8ddffd 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3360,7 +3360,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);
@@ -3470,7 +3470,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);