diff options
| author | ivan <ivan> | 2003-11-12 12:29:55 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-11-12 12:29:55 +0000 |
| commit | b8ee561782245f581eb2ff196b1863bde2a4c3cc (patch) | |
| tree | e1f4b1a53e0fbdb5ad87c234dcb3c7dd2ad6a44f | |
| parent | 01cd2fbc632b72458e11511340e9f8cd19f8f62a (diff) | |
allow provisioning of unaudited services with a svcnum for imports
| -rw-r--r-- | FS/FS/svc_Common.pm | 8 | ||||
| -rw-r--r-- | FS/FS/svc_acct.pm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm index ca707bbdf..2e236ee2e 100644 --- a/FS/FS/svc_Common.pm +++ b/FS/FS/svc_Common.pm @@ -66,9 +66,9 @@ sub insert { return $error if $error; my $svcnum = $self->svcnum; - my $cust_svc; + my $cust_svc = $svcnum ? qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) : ''; #unless ( $svcnum ) { - if ( ! $svcnum || ! qsearchs('cust_svc',{'svcnum'=>$self->svcnum} ) ) { + if ( !$svcnum or !$cust_svc ) { $cust_svc = new FS::cust_svc ( { #hua?# 'svcnum' => $svcnum, 'svcnum' => $self->svcnum, @@ -82,7 +82,7 @@ sub insert { } $svcnum = $self->svcnum($cust_svc->svcnum); } else { - $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum}); + #$cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum}); unless ( $cust_svc ) { $dbh->rollback if $oldAutoCommit; return "no cust_svc record found for svcnum ". $self->svcnum; @@ -380,7 +380,7 @@ sub cancel { ''; } =head1 VERSION -$Id: svc_Common.pm,v 1.12.4.3 2003-11-11 15:04:24 ivan Exp $ +$Id: svc_Common.pm,v 1.12.4.4 2003-11-12 12:29:55 ivan Exp $ =head1 BUGS diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index a0823e6d4..e0fe7ea2c 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -230,7 +230,7 @@ sub insert { # 'domsvc' => $self->domsvc, # } ); - if ( $self->svcnum ) { + if ( $self->svcnum && qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) ) { my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum}); unless ( $cust_svc ) { $dbh->rollback if $oldAutoCommit; |