[freeside-commits] branch master updated. 9f382a36db24e3782e5fdcbaf1a43b61659ffa4e

[Mark Wells]

The branch, master has been updated
       via  9f382a36db24e3782e5fdcbaf1a43b61659ffa4e (commit)
      from  8e64188a4f9886971da617a1bde869d5725f82c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f382a36db24e3782e5fdcbaf1a43b61659ffa4e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 21 11:41:55 2015 -0700

    fix line item report descriptions when showing both tax and non-tax items, #37301

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 6c2cfde..82e87fb 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)';
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/cust_bill_pkg.cgi |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)