From: Mark Wells <mark@freeside.biz>
Date: Tue, 7 Jun 2016 06:48:30 +0000 (-0700)
Subject: fix linking of new customer contact to an existing email address, #25536
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a1d1dc9edcb57c0295689203de577c670f947b60

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 3b1c951a5..ee1c15f25 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)";