[freeside-commits] branch master updated. b8e4ca0d3999d51c6970bd084d889abebcaae2cf

[Mark Wells]

The branch, master has been updated
       via  b8e4ca0d3999d51c6970bd084d889abebcaae2cf (commit)
       via  94759bfdd5d12dd02c4fd850667d936b77cd7d81 (commit)
      from  92a1c8645232c0d4df0552f883d21aea185c122a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8e4ca0d3999d51c6970bd084d889abebcaae2cf
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 8 17:06:52 2014 -0700

    avoid foreign key errors when reconciling NENA2 batches, #14049

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 1b76a23..1c9c4a2 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -6610,7 +6610,7 @@ sub tables_hashref {
         'exportnum',      'int',     '',      '', '', '',
         '_date',          'int',     '',      '', '', '',
         'status',     'varchar', 'NULL',      32, '', '',
-        'statustext', 'varchar', 'NULL', $char_d, '', '',
+        'statustext',    'text', 'NULL',      '', '', '',
       ],
       'primary_key'  => 'batchnum',
       'unique'       => [],
@@ -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 accb3f1..e442748 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 71d753a..ad67ba2 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};

commit 94759bfdd5d12dd02c4fd850667d936b77cd7d81
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 8 17:02:12 2014 -0700

    fix delete order to avoid foreign key trouble, #13971

diff --git a/FS/FS/svc_Radius_Mixin.pm b/FS/FS/svc_Radius_Mixin.pm
index 969f749..8e53a15 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;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Schema.pm            |    6 +-----
 FS/FS/export_batch_item.pm |    1 -
 FS/FS/part_export/nena2.pm |    1 -
 FS/FS/svc_Radius_Mixin.pm  |    6 +++---
 4 files changed, 4 insertions(+), 10 deletions(-)