svc-acct-alldomains config file allows selection of accounts from any domain

2 files changed, 8 insertions, 1 deletions

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 204d26af3..c4d1a39d2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -975,6 +975,13 @@ httemplate/docs/config.html
     'select_enum' => [ 'Password', 'User-Password' ],
   },
 
+  {
+    'key'         => 'svc_acct-alldomains',
+    'section'     => '',
+    'description' => 'Allow accounts to select any domain in the database.  Normally accounts can only select from the domain set in the service definition and those purchased by the customer.',
+    'type'        => 'bool',
+  },
+
 );
 
 1;
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 90b26324a..c27bab88a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -163,7 +163,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
   }
 
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-  if ($cust_pkg) {
+  if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
     my @cust_svc =
       map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
           qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );