summaryrefslogtreecommitdiff
path: root/httemplate/search/cust_bill_pkg.cgi
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:42:20 -0700
commita6fdffc9f64dd8eecfd762fa6ee02b110cec7219 (patch)
tree4160266d1b1b7a6842dd92b39f3ff2fe37768f74 /httemplate/search/cust_bill_pkg.cgi
parent7780fe169c3789a5ad2b8674365d78d34b4324bd (diff)
fix line item report descriptions when showing both tax and non-tax items, #37301
Diffstat (limited to 'httemplate/search/cust_bill_pkg.cgi')
-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 6c2cfde1b..82e87fba9 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -240,7 +240,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 =
@@ -315,14 +315,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)';