projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perform 3 character substring searches if you have 'List all customers', RT#75012...
[freeside.git]
/
FS
/
FS
/
tax_rate.pm
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
67dd40e
..
5416ff5
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-398,9
+398,6
@@
method together, and NO items from any other invoice should be included.
=cut
=cut
-# future optimization: it would probably suffice to return only the link
-# records, and let the consolidation routine build the cust_bill_pkgs
-
sub taxline_cch {
my $self = shift;
# this used to accept a hash of options but none of them did anything
sub taxline_cch {
my $self = shift;
# this used to accept a hash of options but none of them did anything
@@
-581,8
+578,10
@@
sub taxline_cch {
'taxtype' => ref($self),
'cents' => $this_tax_cents,
'locationtaxid' => $self->location,
'taxtype' => ref($self),
'cents' => $this_tax_cents,
'locationtaxid' => $self->location,
+ 'taxable_billpkgnum' => $cust_bill_pkg->billpkgnum,
'taxable_cust_bill_pkg' => $cust_bill_pkg,
'taxratelocationnum' => $taxratelocationnum,
'taxable_cust_bill_pkg' => $cust_bill_pkg,
'taxratelocationnum' => $taxratelocationnum,
+ 'taxclass' => $class,
});
push @tax_links, $tax_link;
});
push @tax_links, $tax_link;
@@
-690,7
+689,9
@@
sub tax_on_tax {
"AND (". join(' OR ', map { "taxclassnum = $_" } @taxclassnums ). ")";
qsearch({ 'table' => 'tax_rate',
"AND (". join(' OR ', map { "taxclassnum = $_" } @taxclassnums ). ")";
qsearch({ 'table' => 'tax_rate',
- 'hashref' => { 'geocode' => $geocode, },
+ 'hashref' => { 'data_vendor' => $self->data_vendor,
+ 'geocode' => $geocode,
+ },
'extra_sql' => $extra_sql,
})
'extra_sql' => $extra_sql,
})
@@
-2329,7
+2330,7
@@
EOF
my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
$reportname =~ s/^$dropstring//;
my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
$reportname =~ s/^$dropstring//;
- my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname";
+ my $reporturl = "%%%ROOTURL%%%/misc/queued_report
.html
?report=$reportname";
die "<a href=$reporturl>view</a>\n";
}
die "<a href=$reporturl>view</a>\n";
}