[freeside-commits] freeside/httemplate/search cust_credit_bill_pkg.html, 1.3.4.5, 1.3.4.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv15016

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_credit_bill_pkg.html 
Log Message:
link new tax report to cust_credit_bill_pkg for credits, RT#12332

Index: cust_credit_bill_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_credit_bill_pkg.html,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -w -d -r1.3.4.5 -r1.3.4.6
--- cust_credit_bill_pkg.html	15 Apr 2011 22:04:26 -0000	1.3.4.5
+++ cust_credit_bill_pkg.html	15 Apr 2011 22:12:57 -0000	1.3.4.6
@@ -345,16 +345,7 @@
 
 my $join_pkg;
 
-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";
-}
+my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum )';
 
 if ( $cgi->param('nottax') ) {
 
@@ -372,8 +363,18 @@
             $cgi->param('iscredit') eq 'rate') {
 
     $join_pkg .=
-      ' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ) '.
-      ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
+      ' LEFT JOIN cust_bill_pkg_tax_rate_location 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";
+    }
+
+    $join_pkg .= ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
 
   } elsif ( $conf->exists('tax-pkg_address') ) {