[freeside-commits] branch FREESIDE_4_BRANCH updated. 3f2d6b89fb1c8cad50c806e3f2452e909bfbab00

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  3f2d6b89fb1c8cad50c806e3f2452e909bfbab00 (commit)
       via  34c7435b9c15649b93f99c487b225e012c41957b (commit)
      from  981723fc428056c4b64bc9bb44f5e13d304c4b5c (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 3f2d6b89fb1c8cad50c806e3f2452e909bfbab00
Author: Mark Wells <mark at freeside.biz>
Date:   Sat Jan 30 20:31:31 2016 -0800

    silence warning

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 35c79f5..02c8e34 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -614,7 +614,8 @@ sub import_from_gateway {
       my $error;
 
       my $paybatch = $gateway->gatewaynum .  '-' .  $gateway->gateway_module .
-        ':' . $item->authorization .  ':' . $item->order_number;
+        ':' . ($item->authorization || '') .
+        ':' . ($item->order_number || '');
 
       if ( $batch->incoming ) {
         # This is a one-way batch.

commit 34c7435b9c15649b93f99c487b225e012c41957b
Author: Mark Wells <mark at freeside.biz>
Date:   Sat Jan 30 20:50:05 2016 -0800

    but without breaking other kinds of exemptions

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index 91b547c..a9b32d1 100644
--- a/FS/FS/TaxEngine/internal.pm
+++ b/FS/FS/TaxEngine/internal.pm
@@ -243,7 +243,6 @@ sub taxline {
               exempt_monthly  => 'Y',
               year            => $year,
               month           => $mon,
-              taxnum          => $tax_object->taxnum,
             });
 
           $taxable_charged -= $addl;
@@ -262,6 +261,8 @@ sub taxline {
     # attach them to the line item
     foreach my $ex (@new_exemptions) {
 
+      $ex->set('taxnum', $taxnum);
+
       if ( $cust_bill_pkg->billpkgnum ) {
         # the exempted item is already inserted (it should be, these days) so
         # insert the exemption record now:

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

Summary of changes:
 FS/FS/TaxEngine/internal.pm |    3 ++-
 FS/FS/pay_batch.pm          |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)