[freeside-commits] branch master updated. 3d5b5f472b76999daacc646f8d45dc42aba48bfd

[Ivan]

The branch, master has been updated
       via  3d5b5f472b76999daacc646f8d45dc42aba48bfd (commit)
      from  19d05a388f1525eeb776295dbba7e3beda9b84f3 (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 3d5b5f472b76999daacc646f8d45dc42aba48bfd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 26 01:56:37 2013 -0800

    fix tax credit report detail w/enable_taxclasses, RT#21558, fallout from #18676

diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html
index b0dbc70..63d70c2 100644
--- a/httemplate/search/cust_credit_bill_pkg.html
+++ b/httemplate/search/cust_credit_bill_pkg.html
@@ -429,7 +429,7 @@ if ( $cgi->param('nottax') ) {
     s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
   }
 
-} else { 
+} else {
 
   #warn "neither nottax nor istax parameters specified";
   #same as before?
@@ -464,7 +464,7 @@ my @post_desc_header = ();
 my @post_desc = ();
 my @post_desc_null = ();
 my $post_desc_align = '';
-if ( $conf->exists('enable_taxclasses') ) {
+if ( $conf->exists('enable_taxclasses') && ! $cgi->param('istax') ) {
   push @post_desc_header, 'Tax class';
   push @post_desc, 'taxclass';
   push @post_desc_null, '';

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

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