X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=430c50c5fe629982e91451cc78819ea37d739e88;hp=1f9e0f9047ed42ccddd626c7d992c99f08a05fcb;hb=fa2d8d66b29628e95a8a3aad05e59cbb173f4671;hpb=811e59bef46fb10d713f7ed5b81183ed1293072a

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1f9e0f904..430c50c5f 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -93,7 +93,7 @@ function areyousure(href, message) {
 
 % if (     $curuser->access_right('Merge customer')
 %      and (    scalar($cust_main->ncancelled_pkgs)
-%            || $conf->exists('deletecustomers')
+%            # || we start supporting payment info merge again in some way
 %          )
 %    )
 % {
@@ -108,12 +108,6 @@ function areyousure(href, message) {
   &> | 
 % } 
 
-% if ( $conf->exists('deletecustomers')
-%        && $curuser->access_right('Delete customer')
-%      ) {
-  <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>"><% mt('Delete this customer') |h %></A> | 
-% } 
-
 % unless ( $conf->exists('disable_customer_referrals') ) { 
   <A HREF="<% $p %>edit/cust_main.cgi?referral_custnum=<% $custnum %>"><% mt('Refer a new customer') |h %></A> | 
   <A HREF="<% $p %>search/cust_main.cgi?referral_custnum=<% $custnum %>"><% mt('View this customer\'s referrals') |h %></A>