projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_bill_pkg_tax_location.pm
diff --git
a/FS/FS/cust_bill_pkg_tax_location.pm
b/FS/FS/cust_bill_pkg_tax_location.pm
index
2ffc273
..
7c67c2d
100644
(file)
--- a/
FS/FS/cust_bill_pkg_tax_location.pm
+++ b/
FS/FS/cust_bill_pkg_tax_location.pm
@@
-144,6
+144,19
@@
Returns the cust_bill_pkg object for the I<taxable> charge.
Returns the associated cust_location object
Returns the associated cust_location object
+=item taxname
+
+Returns the tax name (for populating the itemdesc field).
+
+=cut
+
+sub taxname {
+ my $self = shift;
+ my $cust_main_county = FS::cust_main_county->by_key($self->taxnum)
+ or return '';
+ $cust_main_county->taxname || 'Tax';
+}
+
=item desc
Returns a description for this tax line item constituent. Currently this
=item desc
Returns a description for this tax line item constituent. Currently this
@@
-325,7
+338,7
@@
sub upgrade_taxable_billpkgnum {
} #for $i
} else {
# the more complicated case
} #for $i
} else {
# the more complicated case
- $log->warn("mismatched charges and tax links in pkg#$pkgnum",
+ $log->warn
ing
("mismatched charges and tax links in pkg#$pkgnum",
object => $cust_bill);
my $tax_amount = sum(map {$_->amount} @tax_links);
# remove all tax link records and recreate them to be 1:1 with
object => $cust_bill);
my $tax_amount = sum(map {$_->amount} @tax_links);
# remove all tax link records and recreate them to be 1:1 with