From a292db1a4cf376464f01b5625da8680bcb7928da Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Fri, 17 Jan 2014 16:39:28 -0800 Subject: fix a snarl in query construction --- httemplate/search/cust_bill_pkg.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'httemplate') diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 61093d262..7476f4d8c 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -436,12 +436,12 @@ if ( $cgi->param('nottax') ) { $join_pkg .= " LEFT JOIN ($exempt_sub) AS item_exempt USING (billpkgnum)"; - } - # process tax restrictions - unshift @tax_where, - 'cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum', - 'cust_main_county.tax > 0'; + # process tax restrictions + unshift @tax_where, + 'cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum', + 'cust_main_county.tax > 0'; + } my $tax_sub = "SELECT 1 FROM cust_bill_pkg_tax_location -- cgit v1.2.1 From 074ab75187e3575674941a72ea50205c2ec42595 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Fri, 17 Jan 2014 16:48:21 -0800 Subject: show add-on package description in sales report, #25836 --- httemplate/search/cust_bill_pkg.cgi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'httemplate') diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 7476f4d8c..6b7a5e6e2 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -20,12 +20,10 @@ 'fields' => [ @pkgnum, sub { $_[0]->pkgnum > 0 - # possibly use override.pkg but i think this correct ? $_[0]->get('pkgpart') : '' }, sub { $_[0]->pkgnum > 0 - # possibly use override.pkg but i think this correct ? $_[0]->get('pkg') : $_[0]->get('itemdesc') }, @@ -246,7 +244,6 @@ if ( $conf->exists('enable_taxclasses') ) { push @post_desc, 'taxclass'; push @post_desc_null, ''; $post_desc_align .= 'l'; - push @select, 'part_pkg.taxclass'; # or should this use override? } # valid in both the tax and non-tax cases @@ -321,7 +318,8 @@ if ( $use_override ) { )"; $part_pkg = 'override'; } -push @select, 'part_pkg.pkgpart', 'part_pkg.pkg'; # or should this use override? +push @select, "$part_pkg.pkgpart", "$part_pkg.pkg"; +push @select, "$part_pkg.taxclass" if $conf->exists('enable_taxclasses'); # the non-tax case if ( $cgi->param('nottax') ) { -- cgit v1.2.1