diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-21 16:31:45 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-21 16:31:45 -0700 |
| commit | 1bfdf0c3197b3daa99023be73f8b756debc336b8 (patch) | |
| tree | bde1ac8789154d19c269468fd5c3c7352afafaad | |
| parent | cbd5a370da7cb0e7046fb0de5e3f419c69beda0f (diff) | |
| parent | 99a2cca111734e80c36977cdd9f4abd5964b26a6 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
| -rw-r--r-- | httemplate/search/cust_bill_pkg.cgi | 6 |
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)'; |