projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6452a47
)
fix linking of new customer contact to an existing email address, #25536
author
Mark Wells
<mark@freeside.biz>
Tue, 7 Jun 2016 06:48:30 +0000
(23:48 -0700)
committer
Mark Wells
<mark@freeside.biz>
Tue, 7 Jun 2016 06:49:00 +0000
(23:49 -0700)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
3b1c951
..
ee1c15f
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-555,7
+555,10
@@
sub insert {
return $error;
}
}
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"
}
warn " setting contacts\n"
@@
-579,8
+582,7
@@
sub insert {
custnum => $self->custnum,
});
$cust_contact->set('invoice_dest', 'Y');
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)";
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return "$error (linking to email address $dest)";