[freeside-commits] branch FREESIDE_4_BRANCH updated. 747af1b66a1e25325ee610c6f3a82441bddcd711

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  747af1b66a1e25325ee610c6f3a82441bddcd711 (commit)
      from  ce891927b64922ae7c305ca8c3793b8be1a3b909 (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 747af1b66a1e25325ee610c6f3a82441bddcd711
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Jun 6 23:48:30 2016 -0700

    fix linking of new customer contact to an existing email address, #25536

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 68ddca2..335ecbf 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -555,7 +555,10 @@ sub insert {
         return $error;
       }
     }
-
+    # since we set invoice_dest on all migrated prospect contacts (for now),
+    # don't process invoicing_list.
+    delete $options{'invoicing_list'};
+    $invoicing_list = undef;
   }
 
   warn "  setting contacts\n"
@@ -579,8 +582,7 @@ sub insert {
               custnum       => $self->custnum,
           });
           $cust_contact->set('invoice_dest', 'Y');
-          my $error = $cust_contact->contactnum ?
-                        $cust_contact->replace : $cust_contact->insert;
+          my $error = $cust_contact->insert;
           if ( $error ) {
             $dbh->rollback if $oldAutoCommit;
             return "$error (linking to email address $dest)";

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

Summary of changes:
 FS/FS/cust_main.pm |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)