summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2014-01-17 16:54:11 -0800
committerMark Wells <mark@freeside.biz>2014-01-17 16:54:11 -0800
commit05135fbc01e3d10a835b73915f61c51bb5dd0c60 (patch)
treef91b03f5cae834637ff58d46b6ec04b3cb264c5e
parenta9a38c344a6cba8c8bdf1b29a5be3c1c262aa8b8 (diff)
show add-on package description in sales report, #25836
-rw-r--r--httemplate/search/cust_bill_pkg.cgi6
1 files changed, 2 insertions, 4 deletions
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index ab23e52a8..0b6147170 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -19,12 +19,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')
},
@@ -222,7 +220,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
@@ -297,7 +294,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') ) {