RT# 73422 Agent virt update for report Customer Contacts

[freeside.git] / httemplate / search / elements / search.html

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 1e9ce5c..18b4c0e 100644 (file)
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -33,13 +33,8 @@ Example:
 
                      },
                      # "select * from tablename";
-<<<<<<< HEAD
    
     #required (now even if 'query' is an SQL query string)
-=======
-
-    #required unless 'query' is an SQL query string (shouldn't be...)
->>>>>>> 95144265eeb3ecd13b16708dbdd75dd3701f92ad
     'count_query' => 'SELECT COUNT(*) FROM tablename',
 
     ###
@@ -124,7 +119,11 @@ Example:
                                #(query needs to be a qsearch hashref and
                                # header & fields need to be defined)
 
-    #handling agent virtualization
+    # Agent Virtualization parameters:
+    #   In this context, only available if your selected table has agentnum.
+    #   You must also include agentnum as a SELECT column in your SQL query,
+    #     or experience non-obvious problems
+    #
     'agent_virt'            => 1, # set true if this search should be
                                   # agent-virtualized
     'agent_null'            => 1, # set true to view global records always