[freeside-commits] branch FREESIDE_3_BRANCH updated. 8120b9af43dac87f1a41ac3c8434465517235a25

Christopher Burger burgerc at freeside.biz
Wed Oct 24 08:54:52 PDT 2018


The branch, FREESIDE_3_BRANCH has been updated
       via  8120b9af43dac87f1a41ac3c8434465517235a25 (commit)
       via  917d2f19d6c4403e685810cc5354640c561aa0b7 (commit)
      from  c4257ec0783ad40d697c22590f804e7d8ce063cd (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 8120b9af43dac87f1a41ac3c8434465517235a25
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Oct 24 10:55:50 2018 -0400

    RT# 76722 - added option to search on tags not selected in advanced customer report

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 1a19ea343..58bdd8835 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -1049,8 +1049,9 @@ sub search {
 
     if ( @tagnums ) {
       if ( $params->{'all_tags'} ) {
+        my $exists = $params->{'all_tags'} eq 'all' ? 'exists' : 'not exists';
         foreach ( @tagnums ) {
-          push @where, 'exists(select 1 from cust_tag where '.
+          push @where, $exists.'(select 1 from cust_tag where '.
                        'cust_tag.custnum = cust_main.custnum and tagnum = '.
                        $_ . ')';
         }
diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index e1ce26dcb..9edd3ee5c 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -104,7 +104,9 @@
           <DIV STYLE="display:inline-block; vertical-align:baseline">
             <INPUT TYPE="radio" NAME="all_tags" VALUE="0" CHECKED> Any of these
             <BR>
-            <INPUT TYPE="radio" NAME="all_tags" VALUE="1"> All of these
+            <INPUT TYPE="radio" NAME="all_tags" VALUE="all"> All of these
+            <BR>
+            <INPUT TYPE="radio" NAME="all_tags" VALUE="none"> None of these
           </DIV>
         </TD>
       </TR>

commit 917d2f19d6c4403e685810cc5354640c561aa0b7
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Oct 24 08:35:18 2018 -0400

    RT# 38844 - Added customer number and name to commission credit event

diff --git a/FS/FS/part_event/Action/bill_sales_credit.pm b/FS/FS/part_event/Action/bill_sales_credit.pm
index ab69375e2..e1474300a 100644
--- a/FS/FS/part_event/Action/bill_sales_credit.pm
+++ b/FS/FS/part_event/Action/bill_sales_credit.pm
@@ -72,7 +72,7 @@ sub do_action {
 
     my $reasonnum = $self->option('reasonnum');
 
-    my $desc = 'from invoice #'. $cust_bill->display_invnum .
+    my $desc = ' for customer #'.$cust_main->display_custnum.': '.$cust_main->name.' from invoice #'. $cust_bill->display_invnum .
                ' ('. time2str($date_format, $cust_bill->_date) . ')';
                # could also show custnum and pkgnums here?
     my $error = $sales_cust_main->credit(

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

Summary of changes:
 FS/FS/cust_main/Search.pm                    | 3 ++-
 FS/FS/part_event/Action/bill_sales_credit.pm | 2 +-
 httemplate/search/report_cust_main.html      | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list