projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
link new tax report to cust_credit_bill_pkg for credits, RT#12332
[freeside.git]
/
httemplate
/
search
/
cust_credit_bill_pkg.html
diff --git
a/httemplate/search/cust_credit_bill_pkg.html
b/httemplate/search/cust_credit_bill_pkg.html
index
f346035
..
c699547
100644
(file)
--- a/
httemplate/search/cust_credit_bill_pkg.html
+++ b/
httemplate/search/cust_credit_bill_pkg.html
@@
-347,17
+347,15
@@
my $join_pkg;
my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum';
if ( $cgi->param('iscredit') eq 'rate' ) {
my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum';
if ( $cgi->param('iscredit') eq 'rate' ) {
- $join_pkg .= ', billpkgtaxratelocationnum )';
+ $join_
cust_bill_
pkg .= ', billpkgtaxratelocationnum )';
} elsif ( $conf->exists('tax-pkg_address') ) {
} elsif ( $conf->exists('tax-pkg_address') ) {
- $join_pkg .= ', billpkgtaxlocationnum )';
+ $join_
cust_bill_
pkg .= ', billpkgtaxlocationnum )';
push @where, "billpkgtaxratelocationnum IS NULL";
} else {
push @where, "billpkgtaxratelocationnum IS NULL";
} else {
- $join_pkg .= ' )';
+ $join_
cust_bill_
pkg .= ' )';
push @where, "billpkgtaxratelocationnum IS NULL";
}
push @where, "billpkgtaxratelocationnum IS NULL";
}
- )';
-
if ( $cgi->param('nottax') ) {
$join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )
if ( $cgi->param('nottax') ) {
$join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )