X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_credit_bill_pkg.html;h=c6995470dc5775b57a6c431d5c33c7af8b422f08;hb=386e5631dd76e01faaad23a15d5977e13587b135;hp=a73e61c390cc87d5ac66181e899c67c2be22a9ea;hpb=3983d5ee6135e5d3f57a111e890bebd22e11da97;p=freeside.git

diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html
index a73e61c39..c6995470d 100644
--- a/httemplate/search/cust_credit_bill_pkg.html
+++ b/httemplate/search/cust_credit_bill_pkg.html
@@ -345,7 +345,16 @@ my $join_cust =
 
 my $join_pkg;
 
-my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum )';
+my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum';
+if ( $cgi->param('iscredit') eq 'rate' ) {
+  $join_cust_bill_pkg .= ', billpkgtaxratelocationnum )';
+} elsif ( $conf->exists('tax-pkg_address') ) {
+  $join_cust_bill_pkg .= ', billpkgtaxlocationnum )';
+  push @where, "billpkgtaxratelocationnum IS NULL";
+} else {
+  $join_cust_bill_pkg .= ' )';
+  push @where, "billpkgtaxratelocationnum IS NULL";
+}
 
 if ( $cgi->param('nottax') ) {
 
@@ -375,19 +384,6 @@ if ( $cgi->param('nottax') ) {
     s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
   }
 
-  #if ( $cgi->param('iscredit') ) {
-    $join_pkg .= ' JOIN cust_credit_bill_pkg USING ( billpkgnum';
-    if ( $cgi->param('iscredit') eq 'rate' ) {
-      $join_pkg .= ', billpkgtaxratelocationnum )';
-    } elsif ( $conf->exists('tax-pkg_address') ) {
-      $join_pkg .= ', billpkgtaxlocationnum )';
-      push @where, "billpkgtaxratelocationnum IS NULL";
-    } else {
-      $join_pkg .= ' )';
-      push @where, "billpkgtaxratelocationnum IS NULL";
-    }
-  #}
-
 } else { 
 
   #die?