From e0d4d66f670371a0c8a40dc471352634f9fd6017 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Fri, 3 May 2013 00:31:07 -0700 Subject: merging is now attaching by default, with the old destructive merge operation as an option when deletecustomers is enabled, RT#22185 --- httemplate/view/cust_main.cgi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'httemplate/view/cust_main.cgi') 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, } &> | % } -- cgit v1.2.1