add inter.net numbering on freeside custnum instead, RT#15326

[freeside.git] / FS / FS / cust_main.pm

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 32912af..12dc9ef 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -676,15 +676,6 @@ sub auto_agent_custid {
 
     $counter->unlock;
 
-  } elsif ( $format eq '1001XXXXXXXX' ) {
-
-    my $counter = new File::CounterFile 'cust_main.agent_custid';
-    $counter->lock;
-
-    $agent_custid = '1001'. $counter->inc;
-
-    $counter->unlock;
-
   } else {
     die "Unknown cust_main-auto_agent_custid format: $format";
   }
@@ -3888,6 +3879,9 @@ sub display_custnum {
   my $self = shift;
   if ( $conf->exists('cust_main-default_agent_custid') && $self->agent_custid ){
     return $self->agent_custid;
+  } elsif ( $conf->config('cust_main-custnum-display_prefix') ) {
+    return $conf->config('cust_main-custnum-display_prefix').
+           sprintf('%08d', $self->custnum)
   } else {
     return $self->custnum;
   }