summaryrefslogtreecommitdiff
path: root/httemplate/misc/merge_cust.html
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate/misc/merge_cust.html')
-rw-r--r--httemplate/misc/merge_cust.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/httemplate/misc/merge_cust.html b/httemplate/misc/merge_cust.html
index 9c869fa21..c923b7b1f 100644
--- 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')),
&>
-% if ( $conf->exists('deletecustomers') ) {
+% if ( 0 ) { #we start supporting payment info merge again in some way
% if ( scalar($cust_main->ncancelled_pkgs) ) {
<TR>
@@ -67,7 +67,7 @@ function do_submit_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>
% }