projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no need for fix for #74270 in 5.x, FK enforcement was strict in 4.x
[freeside.git]
/
httemplate
/
misc
/
merge_cust.html
diff --git
a/httemplate/misc/merge_cust.html
b/httemplate/misc/merge_cust.html
index
9c869fa
..
c923b7b
100644
(file)
--- a/
httemplate/misc/merge_cust.html
+++ b/
httemplate/misc/merge_cust.html
@@
-43,7
+43,7
@@
function do_submit_merge() {
'curr_value' => scalar($cgi->param('new_custnum')),
&>
'curr_value' => scalar($cgi->param('new_custnum')),
&>
-% if (
$conf->exists('deletecustomers') ) {
+% if (
0 ) { #we start supporting payment info merge again in some way
% if ( scalar($cust_main->ncancelled_pkgs) ) {
<TR>
% if ( scalar($cust_main->ncancelled_pkgs) ) {
<TR>
@@
-67,7
+67,7
@@
function do_submit_merge() {
'value' => 'Y',
'curr_value' => scalar($cgi->param('merge')),
&>
'value' => 'Y',
'curr_value' => scalar($cgi->param('merge')),
&>
- Merge invoices, payments/credits, notes, tickets and delete this customer.
+ Merge invoices, payments/credits, notes, tickets and delete
<!-- ^Warchive -->
this customer.
</TD>
</TR>
% }
</TD>
</TR>
% }