[freeside-commits] branch FREESIDE_4_BRANCH updated. 4f5e4641c64227e3b2c5ef369abc405a64b7bed7

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  4f5e4641c64227e3b2c5ef369abc405a64b7bed7 (commit)
       via  8116969d1859ef250f843de119d483038e48226f (commit)
      from  f75c2fa9ad468b1e09651b0ce912eac380928024 (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 4f5e4641c64227e3b2c5ef369abc405a64b7bed7
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jul 26 16:44:10 2016 -0500

    RT#38217: Send email when logging conditions are met [fix to warning invocation in cust_bill_pkg_tax_location]

diff --git a/FS/FS/cust_bill_pkg_tax_location.pm b/FS/FS/cust_bill_pkg_tax_location.pm
index 9a1f22a..7c67c2d 100644
--- a/FS/FS/cust_bill_pkg_tax_location.pm
+++ b/FS/FS/cust_bill_pkg_tax_location.pm
@@ -338,7 +338,7 @@ sub upgrade_taxable_billpkgnum {
         } #for $i
       } else {
         # the more complicated case
-        $log->warn("mismatched charges and tax links in pkg#$pkgnum",
+        $log->warning("mismatched charges and tax links in pkg#$pkgnum",
           object => $cust_bill);
         my $tax_amount = sum(map {$_->amount} @tax_links);
         # remove all tax link records and recreate them to be 1:1 with 

commit 8116969d1859ef250f843de119d483038e48226f
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jul 26 14:36:09 2016 -0500

    Bug fix for RT#71623 or RT#13971, discovered during RT#38217, needs backport to v4

diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm
index 29b4b0a..a632ab4 100644
--- a/FS/FS/cust_pkg_reason.pm
+++ b/FS/FS/cust_pkg_reason.pm
@@ -3,7 +3,7 @@ use base qw( FS::otaker_Mixin FS::Record );
 
 use strict;
 use vars qw( $ignore_empty_action );
-use FS::Record qw( qsearch ); #qsearchs );
+use FS::Record qw( qsearch qsearchs );
 use FS::upgrade_journal;
 
 $ignore_empty_action = 0;

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

Summary of changes:
 FS/FS/cust_bill_pkg_tax_location.pm |    2 +-
 FS/FS/cust_pkg_reason.pm            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)