diff options
author | Ivan Kohler <ivan@freeside.biz> | 2017-07-24 11:12:35 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2017-07-24 11:12:35 -0700 |
commit | e07dc02b9570db1a6b7425fa73232678e61364e2 (patch) | |
tree | 09a67f69651901731b7b76822eb33f1852d9df6b /FS | |
parent | 62b68d10c49748e1278d0466a007e5d6491008c7 (diff) |
fix fees vs. tax refactor, RT#76366, RT#76490
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/TaxEngine/internal.pm | 19 |
1 files 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; |