[freeside-commits] freeside/httemplate/elements search-cust_main.html, 1.6, 1.7

[Ivan,,,]

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

Modified Files:
	search-cust_main.html 
Log Message:
customer merging, RT#10247

Index: search-cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/search-cust_main.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- search-cust_main.html	7 Apr 2010 08:15:55 -0000	1.6
+++ search-cust_main.html	20 Oct 2010 02:07:02 -0000	1.7
@@ -11,7 +11,7 @@
   );
 
 </%doc>
-<INPUT TYPE="hidden" NAME="<% $field %>" VALUE="<% $value %>">
+<INPUT TYPE="hidden" NAME="<% $field %>" ID="<% $field %>" VALUE="<% $value %>">
 
 <!-- some false laziness w/ misc/batch-cust_pay.html, though not as bad as i'd thought at first... -->
 
@@ -60,6 +60,9 @@
 
   function smart_<% $field %>_search(what) {
 
+    if ( <% $field %>_search_active )
+      return;
+
     var customer = what.value;
 
     if ( customer == 'searching...' || customer == ''