[freeside-commits] branch master updated. 80cf2cf71008a16ceec18d90711428ba148ca7b3

Ivan ivan at 420.am
Wed Mar 13 18:25:32 PDT 2013


The branch, master has been updated
       via  80cf2cf71008a16ceec18d90711428ba148ca7b3 (commit)
      from  b4c6c58d3f10be9fcd18a449afd3c0d77fb67137 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 80cf2cf71008a16ceec18d90711428ba148ca7b3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Mar 13 18:25:29 2013 -0700

    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
--- 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";
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/elements/cust_pay_or_refund.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)




More information about the freeside-commits mailing list