X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fnas.pm;h=c7f245912d4e2230dfcecfa1a9350bd68a9ce6d9;hp=4564a634206c0083c8a7cd51c7dbcf6a8c0a64c2;hb=e95a28ea14289ffcfa652bff9b179d3820b56242;hpb=2ad6569982365759d7baaf5a97bc836770a54291

diff --git a/FS/FS/nas.pm b/FS/FS/nas.pm
index 4564a6342..c7f245912 100644
--- a/FS/FS/nas.pm
+++ b/FS/FS/nas.pm
@@ -50,6 +50,7 @@ FS::Record.  The following fields are currently supported:
 
 =item description - a longer descriptive name
 
+=item svcnum - the L<FS::svc_broadband> record that 'owns' this device
 
 =back
 
@@ -87,11 +88,14 @@ sub delete {
   my $dbh = dbh;
 
   my $self = shift;
-  my $error = $self->process_m2m([])
-           || $self->SUPER::delete;
+  my $error = $self->process_m2m(
+    link_table    => 'export_nas',
+    target_table  => 'part_export',
+    params        => []
+  ) || $self->SUPER::delete;
 
   if ( $error ) {
-    $dbh->rollback;
+    $dbh->rollback if $oldAutoCommit;
     return $error;
   }
   
@@ -156,6 +160,7 @@ sub check {
     || $self->ut_textn('server')
     || $self->ut_textn('community')
     || $self->ut_text('description')
+    || $self->ut_foreign_keyn('svcnum', 'svc_broadband', 'svcnum')
   ;
   return $error if $error;