[freeside-commits] branch master updated. c5dd9bdf09dff2b5cc6d9a9681894664fe5147ef

[Mark Wells]

The branch, master has been updated
       via  c5dd9bdf09dff2b5cc6d9a9681894664fe5147ef (commit)
       via  c0607591ac4db28b1c4dee0a65546e88c5d62166 (commit)
      from  194c16bf0af62048d118ad28e55f5e1eb5d92ffa (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 c5dd9bdf09dff2b5cc6d9a9681894664fe5147ef
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:

commit c0607591ac4db28b1c4dee0a65546e88c5d62166
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.

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

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