This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / httemplate / view / cust_main.cgi

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 0f9c1e2..b4a6170 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -64,22 +64,6 @@ function areyousure(href, message) {
 
 % }
 
-% if ( $curuser->access_right('Merge customer') ) {
-
-  <% include( '/elements/popup_link-cust_main.html',
-              { 'action'      => $p. 'misc/merge_cust.html',
-                'label'       => 'Merge&nbsp;this&nbsp;customer',
-                'actionlabel' => 'Merge customer',
-                #'color'       => '#ff0000',
-                'cust_main'   => $cust_main,
-                'width'       => 480,
-                'height'      => 192,
-              }
-            )
-  %> | 
-
-% } 
-
 % if ( $conf->exists('deletecustomers')
 %        && $curuser->access_right('Delete customer')
 %      ) {