diff options
| -rw-r--r-- | FS/FS/Schema.pm | 4 | ||||
| -rw-r--r-- | FS/FS/export_batch_item.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_export/nena2.pm | 1 | ||||
| -rw-r--r-- | FS/FS/svc_Radius_Mixin.pm | 6 |
4 files changed, 3 insertions, 9 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index eea43f00f..1c9c4a200 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -6640,10 +6640,6 @@ sub tables_hashref { table => 'export_batch', references => [ 'batchnum' ] }, - { columns => [ 'svcnum' ], - table => 'cust_svc', - references => [ 'svcnum' ] - }, ], }, diff --git a/FS/FS/export_batch_item.pm b/FS/FS/export_batch_item.pm index accb3f1e2..e442748b5 100644 --- a/FS/FS/export_batch_item.pm +++ b/FS/FS/export_batch_item.pm @@ -104,7 +104,6 @@ sub check { || $self->ut_number('batchnum') || $self->ut_foreign_key('batchnum', 'export_batch', 'batchnum') || $self->ut_number('svcnum') - || $self->ut_foreign_key('svcnum', 'cust_svc', 'svcnum') || $self->ut_enum('action', [ qw(insert delete replace suspend unsuspend relocate) ] ) diff --git a/FS/FS/part_export/nena2.pm b/FS/FS/part_export/nena2.pm index 71d753aa1..ad67ba2a0 100644 --- a/FS/FS/part_export/nena2.pm +++ b/FS/FS/part_export/nena2.pm @@ -355,7 +355,6 @@ sub process { # ignore items that have no data to add to the batch next if $item->action eq 'suspend' or $item->action eq 'unsuspend'; - my $svcnum = $item->svcnum; my $data = $item->data; %hash = %{ $item_format->parse($data) }; my $phonenum = $hash{npa} . $hash{calling_number}; diff --git a/FS/FS/svc_Radius_Mixin.pm b/FS/FS/svc_Radius_Mixin.pm index 969f74952..8e53a1562 100644 --- a/FS/FS/svc_Radius_Mixin.pm +++ b/FS/FS/svc_Radius_Mixin.pm @@ -99,12 +99,12 @@ sub delete { local $FS::UID::AutoCommit = 0; my $dbh = dbh; - my $error = $self->SUPER::delete(@_) - || $self->process_m2m( + my $error = $self->process_m2m( 'link_table' => 'radius_usergroup', 'target_table' => 'radius_group', 'params' => [], - ); + ) + || $self->SUPER::delete; if ( $error ) { $dbh->rollback if $oldAutoCommit; |