X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main.cgi;h=be0100fb3cf8d167a7cc45e62e5945b7fe8f3b75;hb=63973c641c4be00765fa27e55c57cc5b9aa4da19;hp=ec3191971522b761ad36b01414453fcfa332518b;hpb=17b4664d50ba04809cb8b68fa0f3b6146b0c8ff3;p=freeside.git

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index ec3191971..be0100fb3 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -91,14 +91,19 @@ function areyousure(href, message) {
   &> | 
 % }
 
-% if ( $curuser->access_right('Merge customer') ) {
+% if (     $curuser->access_right('Merge customer')
+%      and (    scalar($cust_main->ncancelled_pkgs)
+%            || $conf->exists('deletecustomers')
+%          )
+%    )
+% {
   <& /elements/popup_link-cust_main.html,
               { 'action'      => $p. 'misc/merge_cust.html',
                 'label'       => emt('Merge this customer'),
                 'actionlabel' => emt('Merge customer'),
                 'cust_main'   => $cust_main,
-                'width'       => 480,
-                'height'      => 192,
+                'width'       => 569,
+                'height'      => 210,
               }
   &> | 
 % }