From fa2d8d66b29628e95a8a3aad05e59cbb173f4671 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 19 Jun 2013 15:27:21 -0700
Subject: remove customer deletion

---
 httemplate/misc/merge_cust.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/misc/merge_cust.html')

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>
 % }
-- 
cgit v1.2.1