[freeside-commits] freeside/httemplate/view cust_main.cgi, 1.134, 1.135

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv8653/httemplate/view

Modified Files:
	cust_main.cgi 
Log Message:
customer merging, RT#10247

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main.cgi,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -w -d -r1.134 -r1.135
--- cust_main.cgi	4 Sep 2010 02:19:03 -0000	1.134
+++ cust_main.cgi	20 Oct 2010 02:07:02 -0000	1.135
@@ -64,6 +64,22 @@
 
 % }
 
+% 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')
 %      ) {