summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-07-21 11:41:55 -0700
committerMark Wells <mark@freeside.biz>2015-07-21 11:49:09 -0700
commit99a2cca111734e80c36977cdd9f4abd5964b26a6 (patch)
tree2007910dd0c19d4fcb36971aea2101c6d9d7c656
parent936160bf9d4bff3abbe8c71f9985c33d54cf3ca3 (diff)
fix line item report descriptions when showing both tax and non-tax items, #37301
-rw-r--r--httemplate/search/cust_bill_pkg.cgi6
1 files changed, 3 insertions, 3 deletions
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 8892af123..a5424033d 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -216,7 +216,7 @@ if ( $conf->exists('enable_taxclasses') ) {
}
# used in several places
-my $itemdesc = 'COALESCE(part_fee.itemdesc, part_pkg.pkg, cust_bill_pkg.itemdesc)';
+my $itemdesc = 'COALESCE(cust_bill_pkg.itemdesc, part_fee.itemdesc, part_pkg.pkg, cust_bill_pkg.itemdesc)';
# valid in both the tax and non-tax cases
my $join_cust =
@@ -291,14 +291,14 @@ if ( $use_override ) {
$part_pkg = 'override';
}
push @select, "$part_pkg.pkgpart", "$part_pkg.pkg";
+push @select, "($itemdesc) AS itemdesc"; # available in all report modes
+
push @select, "COALESCE($part_pkg.taxclass, part_fee.taxclass) AS taxclass"
if $conf->exists('enable_taxclasses');
# the non-tax case
if ( $cgi->param('nottax') ) {
- push @select, "($itemdesc) AS itemdesc";
-
push @where,
'(cust_bill_pkg.pkgnum > 0 OR cust_bill_pkg.feepart IS NOT NULL)';