[freeside-commits] branch FREESIDE_3_BRANCH updated. 05135fbc01e3d10a835b73915f61c51bb5dd0c60

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  05135fbc01e3d10a835b73915f61c51bb5dd0c60 (commit)
      from  a9a38c344a6cba8c8bdf1b29a5be3c1c262aa8b8 (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 05135fbc01e3d10a835b73915f61c51bb5dd0c60
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Jan 17 16:54:11 2014 -0800

    show add-on package description in sales report, #25836

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index ab23e52..0b61471 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') ) {

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

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