From a1c1af9f78fd9b8892c43b4963ffa26ad42cb5af Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 24 Jul 2017 11:12:34 -0700 Subject: [PATCH] fix fees vs. tax refactor, RT#76366, RT#76490 --- FS/FS/TaxEngine/internal.pm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/FS/FS/TaxEngine/internal.pm b/FS/FS/TaxEngine/internal.pm index df2d60956..dbe9a99e0 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; -- 2.11.0