projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d75388b
)
fix line item report when linked from CCH tax report credits, RT#12329
author
ivan
<ivan>
Sat, 2 Apr 2011 19:23:08 +0000
(19:23 +0000)
committer
ivan
<ivan>
Sat, 2 Apr 2011 19:23:08 +0000
(19:23 +0000)
httemplate/search/cust_bill_pkg.cgi
patch
|
blob
|
history
diff --git
a/httemplate/search/cust_bill_pkg.cgi
b/httemplate/search/cust_bill_pkg.cgi
index
a87e446
..
0db4b35
100644
(file)
--- a/
httemplate/search/cust_bill_pkg.cgi
+++ b/
httemplate/search/cust_bill_pkg.cgi
@@
-475,13
+475,12
@@
if ( $cgi->param('pkg_tax') ) {
$count_query .= "SUM(usage)";
} elsif ( $unearned ) {
$count_query .= "SUM(cust_bill_pkg.recur)";
$count_query .= "SUM(usage)";
} elsif ( $unearned ) {
$count_query .= "SUM(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 {
} 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))";
- } else {
- $count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
- }
+ $count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
}
if ( $unearned ) {
}
if ( $unearned ) {