projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e8e0a28
)
fix fees vs. tax refactor, RT#76366, RT#76490
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 24 Jul 2017 18:12:34 +0000
(11:12 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 24 Jul 2017 18:12:34 +0000
(11:12 -0700)
FS/FS/TaxEngine/internal.pm
patch
|
blob
|
history
diff --git
a/FS/FS/TaxEngine/internal.pm
b/FS/FS/TaxEngine/internal.pm
index
df2d609
..
dbe9a99
100644
(file)
--- 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);
}
$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({
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;
'taxable_cust_bill_pkg' => $cust_bill_pkg,
});
push @tax_links, $location;