2 files changed, 36 insertions, 12 deletions
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>
diff --git a/httemplate/misc/delete-note.html b/httemplate/misc/delete-note.html
new file mode 100644
index 000000000..436326ff1
--- /dev/null
+++ b/httemplate/misc/delete-note.html
@@ -0,0 +1,11 @@
+<%init>
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Edit customer note');
+
+my ($notenum) = $cgi->keywords;
+$notenum =~ /^\d+$/ or die "bad notenum '$notenum'";
+my $note = FS::cust_main_note->by_key($notenum)
+  or die "notenum '$notenum' not found";
+$note->delete;
+</%init>
+<% $cgi->redirect($p.'view/cust_main.cgi?'.$note->custnum) %>