multiple payment types on payment and refund reports, RT#21061

diff --git a/httemplate/search/elements/cust_pay_or_refund.html b/httemplate/search/elements/cust_pay_or_refund.html
index 4212daa..d5403de 100755 (executable)
--- a/httemplate/search/elements/cust_pay_or_refund.html
+++ b/httemplate/search/elements/cust_pay_or_refund.html
@@ -376,7 +376,7 @@ if ( $cgi->param('magic') ) {
 
       }
 
-      push @search, join(' OR ', @all_payby_search) if @all_payby_search;
+      push @search, ' ( '. join(' OR ', @all_payby_search). ' ) ' if @all_payby_search;
 
     }
 
@@ -406,6 +406,7 @@ if ( $cgi->param('magic') ) {
     }
 
     my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+warn $beginning;
     push @search, "_date >= $beginning ",
                   "_date <= $ending";