X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fcancel-unaudited.cgi;h=4b3084f00a648348d0e8988a6831a2a30631fb5e;hp=4919c6632df4227404e49279fffb3dc79427e5f5;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hpb=f49f11d4c3c4ba9480cc5c9acfaa606a5ba73ad1

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 4919c6632..4b3084f00 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -15,19 +15,32 @@ my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
 my $svcnum = $1;
 
-#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-#die "Unknown svcnum!" unless $svc_acct;
-
+my $error = '';
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $cust_svc;
-my $cust_pkg = $cust_svc->cust_pkg;
-if ( $cust_pkg ) {
-  errorpage( 'This account has already been audited.  Cancel the '.
-           qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
-           '#cust_pkg'. $cust_pkg->pkgnum. '">'.
-           'package</A> instead.');
-}
+if ( $cust_svc ) {
+  my $cust_pkg = $cust_svc->cust_pkg;
+  if ( $cust_pkg ) {
+    errorpage( 'This account has already been audited.  Cancel the '.
+             qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
+             '#cust_pkg'. $cust_pkg->pkgnum. '">'.
+             'package</A> instead.'); #'
+  }
 
-my $error = $cust_svc->cancel;
+  $error = $cust_svc->cancel;
+} else {
+  # the rare obscure case: svc_x without cust_svc
+  my $svc_x;
+  foreach my $svcdb (FS::part_svc->svc_tables) {
+    $svc_x = qsearchs($svcdb, { 'svcnum' => $svcnum });
+    last if $svc_x;
+  }
+  if ( $svc_x ) {
+    $error = $svc_x->return_inventory
+             || $svc_x->FS::Record::delete;
+  } else {
+    # the svcnum really doesn't exist
+    $error = "svcnum $svcnum not found";
+  }
+}
 
 </%init>