projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
non-package fees, fixes for tax calculation and sales reports, #25899
[freeside.git]
/
FS
/
FS
/
TemplateItem_Mixin.pm
diff --git
a/FS/FS/TemplateItem_Mixin.pm
b/FS/FS/TemplateItem_Mixin.pm
index
569d98c
..
bf857a9
100644
(file)
--- a/
FS/FS/TemplateItem_Mixin.pm
+++ b/
FS/FS/TemplateItem_Mixin.pm
@@
-62,7
+62,9
@@
sub desc {
if ( $self->pkgnum > 0 ) {
$self->itemdesc || $self->part_pkg->pkg_locale($locale);
if ( $self->pkgnum > 0 ) {
$self->itemdesc || $self->part_pkg->pkg_locale($locale);
- } else {
+ } elsif ( $self->feepart ) {
+ $self->part_fee->itemdesc_locale($locale);
+ } else { # by the process of elimination it must be a tax
my $desc = $self->itemdesc || 'Tax';
$desc .= ' '. $self->itemcomment if $self->itemcomment =~ /\S/;
$desc;
my $desc = $self->itemdesc || 'Tax';
$desc .= ' '. $self->itemcomment if $self->itemcomment =~ /\S/;
$desc;