[freeside-commits] freeside/httemplate/search cust_credit_bill_pkg.html, 1.3.4.2, 1.3.4.3

[Ivan,,,]

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

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.2
retrieving revision 1.3.4.3
diff -u -w -d -r1.3.4.2 -r1.3.4.3
--- cust_credit_bill_pkg.html	15 Apr 2011 21:58:10 -0000	1.3.4.2
+++ cust_credit_bill_pkg.html	15 Apr 2011 22:02:11 -0000	1.3.4.3
@@ -345,7 +345,18 @@
 
 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_pkg .= ', billpkgtaxratelocationnum )';
+} elsif ( $conf->exists('tax-pkg_address') ) {
+  $join_pkg .= ', billpkgtaxlocationnum )';
+  push @where, "billpkgtaxratelocationnum IS NULL";
+} else {
+  $join_pkg .= ' )';
+  push @where, "billpkgtaxratelocationnum IS NULL";
+}
+
+ )';
 
 if ( $cgi->param('nottax') ) {
 
@@ -375,19 +386,6 @@
     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?