projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb2e6e8
)
fix error on detail for "tax collected" on vendor tax report, RT#12320
author
ivan
<ivan>
Mon, 11 Apr 2011 07:04:47 +0000
(07:04 +0000)
committer
ivan
<ivan>
Mon, 11 Apr 2011 07:04:47 +0000
(07:04 +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
0db4b35
..
9918cf1
100644
(file)
--- a/
httemplate/search/cust_bill_pkg.cgi
+++ b/
httemplate/search/cust_bill_pkg.cgi
@@
-476,7
+476,7
@@
if ( $cgi->param('pkg_tax') ) {
} elsif ( $unearned ) {
$count_query .= "SUM(cust_bill_pkg.recur)";
} elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
} 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))";
+ $count_query .= "SUM( COALESCE(cust_bill_pkg_tax_
rate_
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 {
} elsif ( $cgi->param('iscredit') eq 'rate') {
$count_query .= "SUM( cust_credit_bill_pkg.amount )";
} else {