[freeside-commits] branch master updated. a08d811960f14200ccafebcbe24dde8cf3f3ccb2

[Ivan Kohler]

The branch, master has been updated
       via  a08d811960f14200ccafebcbe24dde8cf3f3ccb2 (commit)
      from  07d4f40fde413451502a42550da0cff9fa65a014 (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 a08d811960f14200ccafebcbe24dde8cf3f3ccb2
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Nov 28 13:17:47 2018 -0800

    fix error linking legacy services, RT#81818

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 4aa7504f7..9e16142e0 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -453,8 +453,10 @@ sub replace {
   #my $error = $new->SUPER::replace($old, @_);
   my $error = $new->SUPER::replace($old);
 
-  #trigger a relocate export on location changes
-  if ( $new->cust_pkg->locationnum != $old->cust_pkg->locationnum ) {
+  #trigger a relocate export on location changes (NENA2 and Northern 911 export)
+  my $old_pkg = $old->cust_pkg;
+  my $new_pkg = $new->cust_pkg;
+  if ( $old_pkg && $new_pkg && $new_pkg->locationnum != $old_pkg->locationnum ) {
     my $svc_x = $new->svc_x;
     if ( $svc_x->locationnum ) {
       if ( $svc_x->locationnum == $old->cust_pkg->locationnum ) {

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

Summary of changes:
 FS/FS/cust_svc.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)