summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2012-05-24 19:29:23 -0700
committerMark Wells <mark@freeside.biz>2012-05-24 19:29:23 -0700
commitf2c26594352302de80c2cd0cbba8b0e2abada6f7 (patch)
tree61230b9097ec19461b8c2bba9a002124113e526f
parentcf0188f03b566ba9ae95294e211ea788ac9b050c (diff)
use custnum-display_prefix in fancy location labels, #16815
-rw-r--r--FS/FS/Conf.pm8
-rw-r--r--FS/FS/cust_location.pm2
2 files changed, 1 insertions, 9 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e9cdafb..4e497c1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3155,14 +3155,6 @@ and customer address. Include units.',
},
{
- 'key' => 'cust_location-agent_code',
- 'section' => 'UI',
- 'description' => 'Optional agent string for cust_location-label_prefix',
- 'type' => 'text',
- 'per_agent' => 1,
- },
-
- {
'key' => 'cust_pkg-display_times',
'section' => 'UI',
'description' => 'Display full timestamps (not just dates) for customer packages. Useful if you are doing real-time things like hourly prepaid.',
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index a99fa17..bcdb50c 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -429,7 +429,7 @@ sub location_label {
elsif ( $self->prospectnum ) {
$cust_or_prospect = FS::prospect_main->by_key($self->prospectnum);
}
- my $agent = $conf->config('cust_location-agent_code',
+ my $agent = $conf->config('cust_main-custnum-display_prefix',
$cust_or_prospect->agentnum)
|| $cust_or_prospect->agent->agent;
# else this location is invalid