git merge bs

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

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 476b509..1e9ce5c 100644 (file)
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -16,7 +16,7 @@ Example:
                                 # (deprecated, will be singularlized
                                 #  simplisticly)
 
-    #literal SQL query string (deprecated?) or qsearch hashref or arrayref
+    #literal SQL query string (corner cases only) or qsearch hashref or arrayref
     #of qsearch hashrefs for a union of qsearches
     'query'       => {
                        'table'     => 'tablename',
@@ -33,8 +33,13 @@ 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',
 
     ###
@@ -131,7 +136,7 @@ Example:
     'agent_pos'             => 3, # optional position (starting from 0) to
                                   # insert an Agent column (query needs to be a
                                   # qsearch hashref and header & fields need to
-                                  # be defined)cust_pkg_susp.html
+                                  # be defined)
 
     # sort, link & display properties for fields