[freeside-commits] freeside/httemplate/search cust_bill_pkg.cgi, 1.37.2.4, 1.37.2.5

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_bill_pkg.cgi 
Log Message:
fix line item report when linked from CCH tax report credits, RT#12329

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -w -d -r1.37.2.4 -r1.37.2.5
--- cust_bill_pkg.cgi	15 Mar 2011 00:46:38 -0000	1.37.2.4
+++ cust_bill_pkg.cgi	2 Apr 2011 19:23:08 -0000	1.37.2.5
@@ -475,14 +475,13 @@
     $count_query .= "SUM(usage)";
   } elsif ( $unearned ) {
     $count_query .= "SUM(cust_bill_pkg.recur)";
-  } else {
-    if ( scalar( grep( /locationtaxid/, $cgi->param ) ) ||
-              $cgi->param('iscredit') eq 'rate') {
-      $count_query .= "SUM( COALESCE(amount, cust_bill_pkg.setup + cust_bill_pkg.recur))";
+  } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
+    $count_query .= "SUM( COALESCE(cust_bill_pkg_tax_location.amount, cust_bill_pkg.setup + cust_bill_pkg.recur))";
+  } elsif ( $cgi->param('iscredit') eq 'rate') {
+    $count_query .= "SUM( cust_credit_bill_pkg.amount )";
     } else {
       $count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
     }
-  }
 
   if ( $unearned ) {