From: jeff <jeff>
Date: Fri, 16 Feb 2007 20:54:06 +0000 (+0000)
Subject: respect svc_acct-alldomains setting
X-Git-Tag: TRIXBOX_2_6~631
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5bfefc51b44ef58c853f2108c80a57a36296cb79

respect svc_acct-alldomains setting
---

diff --git a/httemplate/misc/svc_acct-domains.cgi b/httemplate/misc/svc_acct-domains.cgi
index 5e96b8d71..3f9599e30 100644
--- a/httemplate/misc/svc_acct-domains.cgi
+++ b/httemplate/misc/svc_acct-domains.cgi
@@ -16,10 +16,16 @@
 %    push @svc_domain, [ $_ => $svc_domain->domain ];
 %    $seen{$_}++;
 %  }
-%  if ($part_svc_column->columnflag eq 'D' || $part_svc_column->columnflag eq '') {
+%  if ($conf->exists('svc_acct-alldomains')
+%       && ( $part_svc_column->columnflag eq 'D'
+%         || $part_svc_column->columnflag eq '' )
+%     ) {
 %    foreach (grep { $_->svcnum ne $output[0] } qsearch('svc_domain', {}) ){
 %      push @svc_domain, [ $_->svcnum => $_->domain ];
 %    }
 %  }
 %
 [ <% join(', ', map { qq("$_->[0]", "$_->[1]") } @svc_domain) %> ]
+<%init>
+my $conf = new FS::Conf;
+</%init>