X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=e43f4f79be096b4382e9c14514c6986a705f533a;hb=e283ab567e6890727e4d8e35c1d8097398678753;hp=549231d3f8200343cf58dfe2bfd570026b1b5720;hpb=13f822a442f093f5658e5571c3d236b80be0113f;p=freeside.git
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 549231d3f..e43f4f79b 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,7 +1,5 @@
<%
-my $mydomain = '';
-
my $conf = new FS::Conf;
my $maxrecords = $conf->config('maxsearchrecordsperpage');
@@ -32,7 +30,7 @@ if ( $query =~ /^UN_(.*)$/ ) {
WHERE 0 <
( SELECT count(*) FROM cust_svc
WHERE cust_svc.svcnum = svc_acct.svcnum
- AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
+ AND ( pkgnum IS NULL OR pkgnum = 0 )
)
";
}
@@ -147,14 +145,8 @@ END
$domain = "svcnum.
"\">". $svc_domain->domain. "";
} else {
- unless ( $mydomain ) {
- my $conf = new FS::Conf;
- unless ( $mydomain = $conf->config('domain') ) {
- die "No legacy domain config file and no svc_domain.svcnum record ".
- "for svc_acct.domsvc: ". $svc_acct->domsvc;
- }
- }
- $domain = "$mydomain*";
+ die "No svc_domain.svcnum record for svc_acct.domsvc: ".
+ $svc_acct->domsvc;
}
my($cust_pkg,$cust_main);
if ( $cust_svc->pkgnum ) {
@@ -216,17 +208,8 @@ END
}
- print "$pager
";
-
- if ( $mydomain ) {
- print "
* The $mydomain domain ".
- "is contained in your legacy domain
".
- "configuration file. ".
- "You should run the bin/fs-migrate-svc_acct_sm
script ".
- "to create a proper svc_domain record for this domain.";
- }
-
- print '