projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache export!
[freeside.git]
/
FS
/
FS
/
svc_domain.pm
diff --git
a/FS/FS/svc_domain.pm
b/FS/FS/svc_domain.pm
index
637d049
..
3941d6e
100644
(file)
--- a/
FS/FS/svc_domain.pm
+++ b/
FS/FS/svc_domain.pm
@@
-251,10
+251,6
@@
sub delete {
return "Can't delete a domain which has accounts!"
if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
return "Can't delete a domain which has accounts!"
if qsearch( 'svc_acct', { 'domsvc' => $self->svcnum } );
- return "Can't delete a domain with (svc_acct_sm) mail aliases!"
- if defined( $FS::Record::dbdef->table('svc_acct_sm') )
- && qsearch('svc_acct_sm', { 'domsvc' => $self->svcnum } );
-
#return "Can't delete a domain with (domain_record) zone entries!"
# if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
#return "Can't delete a domain with (domain_record) zone entries!"
# if qsearch('domain_record', { 'svcnum' => $self->svcnum } );
@@
-386,8
+382,10
@@
sub check {
$recref->{action} =~ /^(M|N)$/ or return "Illegal action";
$recref->{action} = $1;
$recref->{action} =~ /^(M|N)$/ or return "Illegal action";
$recref->{action} = $1;
- my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
- return "Unknown catchall" unless $svc_acct || ! $recref->{catchall};
+ if ( $recref->{catchall} ne '' ) {
+ my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $recref->{catchall} } );
+ return "Unknown catchall" unless $svc_acct;
+ }
$self->ut_textn('purpose');
$self->ut_textn('purpose');