[freeside-commits] branch master updated. a1c1af9f78fd9b8892c43b4963ffa26ad42cb5af

[Ivan]

The branch, master has been updated
       via  a1c1af9f78fd9b8892c43b4963ffa26ad42cb5af (commit)
      from  e8e0a287f09e99e0ced6f05de8d90a41182e9e04 (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 a1c1af9f78fd9b8892c43b4963ffa26ad42cb5af
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jul 24 11:12:34 2017 -0700

    fix fees vs. tax refactor, RT#76366, RT#76490

diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm
index df2d609..dbe9a99 100644
--- a/FS/FS/TaxEngine/internal.pm
+++ b/FS/FS/TaxEngine/internal.pm
@@ -295,12 +295,21 @@ sub taxline {
       $this_tax_cents = int($this_tax_cents);
     }
 
+    my $locationnum;
+    if ( my $cust_pkg = $cust_bill_pkg->cust_pkg ) {
+      $locationnum = $cust_pkg->tax_locationnum;
+    } elsif ( $conf->exists('tax-ship_address') ) {
+      $locationnum = $cust_main->ship_locationnum;
+    } else {
+      $locationnum = $cust_main->bill_locationnum;
+    }
+
     my $location = FS::cust_bill_pkg_tax_location->new({
-        'taxnum'      => $tax_object->taxnum,
-        'taxtype'     => ref($tax_object),
-        'cents'       => $this_tax_cents,
-        'pkgnum'      => $cust_bill_pkg->pkgnum,
-        'locationnum' => $cust_bill_pkg->cust_pkg->tax_locationnum,
+        'taxnum'                => $tax_object->taxnum,
+        'taxtype'               => ref($tax_object),
+        'cents'                 => $this_tax_cents,
+        'pkgnum'                => $cust_bill_pkg->pkgnum,
+        'locationnum'           => $locationnum,
         'taxable_cust_bill_pkg' => $cust_bill_pkg,
     });
     push @tax_links, $location;

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

Summary of changes:
 FS/FS/TaxEngine/internal.pm |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)